From 934896dc0977ea25dc37c13117525f2394625cee Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Sat, 21 Feb 2009 20:59:32 +0000 Subject: 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. ........ --- Lib/difflib.py | 2 +- Lib/distutils/tests/test_core.py | 2 +- Lib/email/message.py | 2 +- Lib/idlelib/AutoComplete.py | 4 ++-- Lib/idlelib/NEWS.txt | 2 +- Lib/io.py | 4 ++-- Lib/optparse.py | 4 ++-- Lib/smtpd.py | 2 +- Lib/subprocess.py | 6 +++--- Lib/tarfile.py | 2 +- Lib/test/test_calendar.py | 2 +- Lib/test/test_cfgparser.py | 8 ++++---- Lib/test/test_codeccallbacks.py | 2 +- Lib/test/test_descrtut.py | 2 +- Lib/test/test_funcattrs.py | 2 +- Lib/test/test_urllib2net.py | 2 +- Lib/tkinter/__init__.py | 2 +- Lib/tkinter/test/test_ttk/test_style.py | 2 +- Lib/tkinter/test/test_ttk/test_widgets.py | 10 +++++----- Lib/turtle.py | 2 +- Lib/wsgiref/headers.py | 2 +- 21 files changed, 33 insertions(+), 33 deletions(-) (limited to 'Lib') diff --git a/Lib/difflib.py b/Lib/difflib.py index 361be6ec145..052a627e214 100644 --- a/Lib/difflib.py +++ b/Lib/difflib.py @@ -1329,7 +1329,7 @@ def _mdiff(fromlines, tolines, context=None, linejunk=None, (from line tuple, to line tuple, boolean flag) from/to line tuple -- (line num, line text) - line num -- integer or None (to indicate a context seperation) + line num -- integer or None (to indicate a context separation) line text -- original line text with following markers inserted: '\0+' -- marks start of added text '\0-' -- marks start of deleted text diff --git a/Lib/distutils/tests/test_core.py b/Lib/distutils/tests/test_core.py index 170d76751e7..7f021dcb3b2 100644 --- a/Lib/distutils/tests/test_core.py +++ b/Lib/distutils/tests/test_core.py @@ -57,7 +57,7 @@ def test_run_setup_provides_file(self): def test_run_setup_uses_current_dir(self): # This tests that the setup script is run with the current directory - # as it's own current directory; this was temporarily broken by a + # as its own current directory; this was temporarily broken by a # previous patch when TESTFN did not use the current directory. sys.stdout = io.StringIO() cwd = os.getcwd() diff --git a/Lib/email/message.py b/Lib/email/message.py index 471d46be141..412a550d275 100644 --- a/Lib/email/message.py +++ b/Lib/email/message.py @@ -21,7 +21,7 @@ SEMISPACE = '; ' # Regular expression that matches `special' characters in parameters, the -# existance of which force quoting of the parameter value. +# existence of which force quoting of the parameter value. tspecials = re.compile(r'[ \(\)<>@,;:\\"/\[\]\?=]') diff --git a/Lib/idlelib/AutoComplete.py b/Lib/idlelib/AutoComplete.py index 9d9a81e45ca..fa1733f9a6e 100644 --- a/Lib/idlelib/AutoComplete.py +++ b/Lib/idlelib/AutoComplete.py @@ -67,7 +67,7 @@ def force_open_completions_event(self, event): def try_open_completions_event(self, event): """Happens when it would be nice to open a completion list, but not - really neccesary, for example after an dot, so function + really necessary, for example after an dot, so function calls won't be made. """ lastchar = self.text.get("insert-1c") @@ -79,7 +79,7 @@ def try_open_completions_event(self, event): COMPLETE_FILES) def autocomplete_event(self, event): - """Happens when the user wants to complete his word, and if neccesary, + """Happens when the user wants to complete his word, and if necessary, open a completion list after that (if there is more than one completion) """ diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 3279299525c..6ff8e6f9a2c 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -339,7 +339,7 @@ What's New in IDLE 1.1a3? window raising, especially in the Windows menu and in the debugger. IDLEfork 763524. -- If user passes a non-existant filename on the commandline, just +- If user passes a non-existent filename on the commandline, just open a new file, don't raise a dialog. IDLEfork 854928. diff --git a/Lib/io.py b/Lib/io.py index c2c1067a2d0..d41da60b916 100644 --- a/Lib/io.py +++ b/Lib/io.py @@ -3,7 +3,7 @@ At the top of the I/O hierarchy is the abstract base class IOBase. It defines the basic interface to a stream. Note, however, that there is no -seperation between reading and writing to streams; implementations are +separation between reading and writing to streams; implementations are allowed to throw an IOError if they do not support a given operation. Extending IOBase is RawIOBase which deals simply with the reading and @@ -1371,7 +1371,7 @@ class TextIOWrapper(TextIOBase): enabled. With this enabled, on input, the lines endings '\n', '\r', or '\r\n' are translated to '\n' before being returned to the caller. Conversely, on output, '\n' is translated to the system - default line seperator, os.linesep. If newline is any other of its + default line separator, os.linesep. If newline is any other of its legal values, that newline becomes the newline when the file is read and it is returned untranslated. On output, '\n' is converted to the newline. diff --git a/Lib/optparse.py b/Lib/optparse.py index 2511595d6a3..7b1734c73b4 100644 --- a/Lib/optparse.py +++ b/Lib/optparse.py @@ -1563,7 +1563,7 @@ def print_usage(self, file=None): """print_usage(file : file = stdout) Print the usage message for the current program (self.usage) to - 'file' (default stdout). Any occurence of the string "%prog" in + 'file' (default stdout). Any occurrence of the string "%prog" in self.usage is replaced with the name of the current program (basename of sys.argv[0]). Does nothing if self.usage is empty or not defined. @@ -1581,7 +1581,7 @@ def print_version(self, file=None): """print_version(file : file = stdout) Print the version message for this program (self.version) to - 'file' (default stdout). As with print_usage(), any occurence + 'file' (default stdout). As with print_usage(), any occurrence of "%prog" in self.version is replaced by the current program's name. Does nothing if self.version is empty or undefined. """ diff --git a/Lib/smtpd.py b/Lib/smtpd.py index ea59aef87ba..3dc979334f8 100755 --- a/Lib/smtpd.py +++ b/Lib/smtpd.py @@ -419,7 +419,7 @@ def process_message(self, peer, mailfrom, rcpttos, data): s = StringIO(data) msg = Message.Message(s) # These headers are required for the proper execution of Mailman. All - # MTAs in existance seem to add these if the original message doesn't + # MTAs in existence seem to add these if the original message doesn't # have them. if not msg.get('from'): msg['From'] = mailfrom diff --git a/Lib/subprocess.py b/Lib/subprocess.py index bd158f66601..c461b254f6d 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -446,9 +446,9 @@ def check_output(*popenargs, **kwargs): To capture standard error in the result, use stderr=subprocess.STDOUT. >>> check_output(["/bin/sh", "-c", - "ls -l non_existant_file ; exit 0"], + "ls -l non_existent_file ; exit 0"], stderr=subprocess.STDOUT) - 'ls: non_existant_file: No such file or directory\n' + 'ls: non_existent_file: No such file or directory\n' """ if 'stdout' in kwargs: raise ValueError('stdout argument not allowed, it will be overridden.') @@ -850,7 +850,7 @@ def _execute_child(self, args, executable, preexec_fn, close_fds, # cause random failures on win9x. Specifically a # dialog: "Your program accessed mem currently in # use at xxx" and a hopeful warning about the - # stability of your system. Cost is Ctrl+C wont + # stability of your system. Cost is Ctrl+C won't # kill children. creationflags |= CREATE_NEW_CONSOLE diff --git a/Lib/tarfile.py b/Lib/tarfile.py index be7daf14c37..4264da337be 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -1753,7 +1753,7 @@ def close(self): def getmember(self, name): """Return a TarInfo object for member `name'. If `name' can not be found in the archive, KeyError is raised. If a member occurs more - than once in the archive, its last occurence is assumed to be the + than once in the archive, its last occurrence is assumed to be the most up-to-date version. """ tarinfo = self._getmember(name) diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py index 5debee9b88f..e8b2ca5482c 100644 --- a/Lib/test/test_calendar.py +++ b/Lib/test/test_calendar.py @@ -170,7 +170,7 @@ class OutputTestCase(unittest.TestCase): def normalize_calendar(self, s): - # Filters out locale dependant strings + # Filters out locale dependent strings def neitherspacenordigit(c): return not c.isspace() and not c.isdigit() diff --git a/Lib/test/test_cfgparser.py b/Lib/test/test_cfgparser.py index dcc1a9807f0..a8418ca5cc6 100644 --- a/Lib/test/test_cfgparser.py +++ b/Lib/test/test_cfgparser.py @@ -82,11 +82,11 @@ def test_basic(self): # Make sure the right things happen for remove_option(); # added to include check for SourceForge bug #123324: self.failUnless(cf.remove_option('Foo Bar', 'foo'), - "remove_option() failed to report existance of option") + "remove_option() failed to report existence of option") self.failIf(cf.has_option('Foo Bar', 'foo'), "remove_option() failed to remove option") self.failIf(cf.remove_option('Foo Bar', 'foo'), - "remove_option() failed to report non-existance of option" + "remove_option() failed to report non-existence of option" " that was removed") self.assertRaises(configparser.NoSectionError, @@ -254,7 +254,7 @@ def test_read_returns_file_list(self): file1 = support.findfile("cfgparser.1") # check when we pass a mix of readable and non-readable files: cf = self.newconfig() - parsed_files = cf.read([file1, "nonexistant-file"]) + parsed_files = cf.read([file1, "nonexistent-file"]) self.assertEqual(parsed_files, [file1]) self.assertEqual(cf.get("Foo Bar", "foo"), "newbar") # check when we pass only a filename: @@ -264,7 +264,7 @@ def test_read_returns_file_list(self): self.assertEqual(cf.get("Foo Bar", "foo"), "newbar") # check when we pass only missing files: cf = self.newconfig() - parsed_files = cf.read(["nonexistant-file"]) + parsed_files = cf.read(["nonexistent-file"]) self.assertEqual(parsed_files, []) # check when we pass no files: cf = self.newconfig() diff --git a/Lib/test/test_codeccallbacks.py b/Lib/test/test_codeccallbacks.py index 549a3486d06..56f3ac11bd7 100644 --- a/Lib/test/test_codeccallbacks.py +++ b/Lib/test/test_codeccallbacks.py @@ -109,7 +109,7 @@ def test_uninamereplace(self): # useful that the error handler is not called for every single # unencodable character, but for a complete sequence of # unencodable characters, otherwise we would output many - # unneccessary escape sequences. + # unnecessary escape sequences. def uninamereplace(exc): if not isinstance(exc, UnicodeEncodeError): diff --git a/Lib/test/test_descrtut.py b/Lib/test/test_descrtut.py index 11a3422a40f..2db3d33226f 100644 --- a/Lib/test/test_descrtut.py +++ b/Lib/test/test_descrtut.py @@ -54,7 +54,7 @@ def merge(self, other): {1: 3.25} >>> print(a[1]) # show the new item 3.25 - >>> print(a[0]) # a non-existant item + >>> print(a[0]) # a non-existent item 0.0 >>> a.merge({1:100, 2:200}) # use a dict method >>> print(sortdict(a)) # show the result diff --git a/Lib/test/test_funcattrs.py b/Lib/test/test_funcattrs.py index 7aab8b813ed..5e47d6bf864 100644 --- a/Lib/test/test_funcattrs.py +++ b/Lib/test/test_funcattrs.py @@ -167,7 +167,7 @@ def test_delete_unknown_attr(self): def test_unset_attr(self): for func in [self.b, self.fi.a]: - try: func.non_existant_attr + try: func.non_existent_attr except AttributeError: pass else: self.fail("using unknown attributes should raise " "AttributeError") diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py index 16ca301808b..4529a8f9c6f 100644 --- a/Lib/test/test_urllib2net.py +++ b/Lib/test/test_urllib2net.py @@ -99,7 +99,7 @@ def setUp(self): def test_ftp(self): urls = [ 'ftp://ftp.kernel.org/pub/linux/kernel/README', - 'ftp://ftp.kernel.org/pub/linux/kernel/non-existant-file', + 'ftp://ftp.kernel.org/pub/linux/kernel/non-existent-file', #'ftp://ftp.kernel.org/pub/leenox/kernel/test', 'ftp://gatekeeper.research.compaq.com/pub/DEC/SRC' '/research-reports/00README-Legal-Rules-Regs', diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index af49170568a..3d519edde31 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -3300,7 +3300,7 @@ def get(self, x, y): """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 cd9d74052d9..3eebb64af8a 100644 --- a/Lib/tkinter/test/test_ttk/test_style.py +++ b/Lib/tkinter/test/test_ttk/test_style.py @@ -61,7 +61,7 @@ def test_layout(self): # 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 af45ca0ac48..29fdce0dab7 100644 --- a/Lib/tkinter/test/test_ttk/test_widgets.py +++ b/Lib/tkinter/test/test_ttk/test_widgets.py @@ -861,9 +861,9 @@ def test_detach_reattach(self): # 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 @@ def test_focus(self): 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 @@ def test_set(self): 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') diff --git a/Lib/turtle.py b/Lib/turtle.py index 55da4e9ba2a..ded2b2712b8 100644 --- a/Lib/turtle.py +++ b/Lib/turtle.py @@ -2793,7 +2793,7 @@ def _polytrafo(self, poly): def _drawturtle(self): """Manages the correct rendering of the turtle with respect to - its shape, resizemode, strech and tilt etc.""" + its shape, resizemode, stretch and tilt etc.""" screen = self.screen shape = screen._shapes[self.turtle.shapeIndex] ttype = shape._type diff --git a/Lib/wsgiref/headers.py b/Lib/wsgiref/headers.py index 4e0076c2cfd..025067a1ef6 100644 --- a/Lib/wsgiref/headers.py +++ b/Lib/wsgiref/headers.py @@ -6,7 +6,7 @@ """ # Regular expression that matches `special' characters in parameters, the -# existance of which force quoting of the parameter value. +# existence of which force quoting of the parameter value. import re tspecials = re.compile(r'[ \(\)<>@,;:\\"/\[\]\?=]') -- cgit v1.2.3-65-gdbad