diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-02-21 20:59:32 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-02-21 20:59:32 (GMT) |
| commit | 934896dc0977ea25dc37c13117525f2394625cee (patch) | |
| tree | f4671cebdd730ba732dcae5185548dd35b9ffa72 /Lib/tkinter | |
| parent | 91cf882b367644ece7f121cd22fc43c2f439a2d5 (diff) | |
| download | cpython-934896dc0977ea25dc37c13117525f2394625cee.zip cpython-934896dc0977ea25dc37c13117525f2394625cee.tar.gz cpython-934896dc0977ea25dc37c13117525f2394625cee.tar.bz2 | |
Merged revisions 69846 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69846 | mark.dickinson | 2009-02-21 20:27:01 +0000 (Sat, 21 Feb 2009) | 2 lines
Issue #5341: Fix a variety of spelling errors.
........
Diffstat (limited to 'Lib/tkinter')
| -rw-r--r-- | Lib/tkinter/__init__.py | 2 | ||||
| -rw-r--r-- | Lib/tkinter/test/test_ttk/test_style.py | 2 | ||||
| -rw-r--r-- | Lib/tkinter/test/test_ttk/test_widgets.py | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index af49170..3d519ed 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -3300,7 +3300,7 @@ class PhotoImage(Image): """Return the color (red, green, blue) of the pixel at X,Y.""" return self.tk.call(self.name, 'get', x, y) def put(self, data, to=None): - """Put row formated colors to image starting from + """Put row formatted colors to image starting from position TO, e.g. image.put("{red green} {blue yellow}", to=(4,6))""" args = (self.name, 'put', data) if to: diff --git a/Lib/tkinter/test/test_ttk/test_style.py b/Lib/tkinter/test/test_ttk/test_style.py index cd9d740..3eebb64 100644 --- a/Lib/tkinter/test/test_ttk/test_style.py +++ b/Lib/tkinter/test/test_ttk/test_style.py @@ -61,7 +61,7 @@ class StyleTest(unittest.TestCase): # correct layout, but "option" doesn't exist as option self.failUnlessRaises(tkinter.TclError, style.layout, 'Treeview', - [('name', {'option': 'inexistant'})]) + [('name', {'option': 'inexistent'})]) def test_theme_use(self): diff --git a/Lib/tkinter/test/test_ttk/test_widgets.py b/Lib/tkinter/test/test_ttk/test_widgets.py index af45ca0..29fdce0 100644 --- a/Lib/tkinter/test/test_ttk/test_widgets.py +++ b/Lib/tkinter/test/test_ttk/test_widgets.py @@ -861,9 +861,9 @@ class TreeviewTest(unittest.TestCase): # bad values self.failUnlessRaises(tkinter.TclError, - self.tv.reattach, 'nonexistant', '', 'end') + self.tv.reattach, 'nonexistent', '', 'end') self.failUnlessRaises(tkinter.TclError, - self.tv.detach, 'nonexistant') + self.tv.detach, 'nonexistent') self.failUnlessRaises(tkinter.TclError, self.tv.reattach, item2, 'otherparent', 'end') self.failUnlessRaises(tkinter.TclError, @@ -897,7 +897,7 @@ class TreeviewTest(unittest.TestCase): self.tv.delete(item1) self.failUnlessEqual(self.tv.focus(), '') - # try focusing inexistant item + # try focusing inexistent item self.failUnlessRaises(tkinter.TclError, self.tv.focus, 'hi') @@ -1064,11 +1064,11 @@ class TreeviewTest(unittest.TestCase): self.failUnlessEqual(self.tv.item(item, values=None), (123, 'a')) self.failUnlessEqual(self.tv.set(item), {'B': 123}) - # inexistant column + # inexistent column self.failUnlessRaises(tkinter.TclError, self.tv.set, item, 'A') self.failUnlessRaises(tkinter.TclError, self.tv.set, item, 'A', 'b') - # inexistant item + # inexistent item self.failUnlessRaises(tkinter.TclError, self.tv.set, 'notme') |