[Python-checkins] cpython (2.7): #11565: Fix several typos. Patch by Piotr Kasprzyk. (original) (raw)

ezio.melotti python-checkins at python.org
Wed Mar 16 11:35:26 CET 2011


http://hg.python.org/cpython/rev/cd8d3c2d3bce changeset: 68588:cd8d3c2d3bce branch: 2.7 parent: 68577:93053ce76075 user: Ezio Melotti <ezio.melotti at gmail.com> date: Wed Mar 16 12:34:31 2011 +0200 summary: #11565: Fix several typos. Patch by Piotr Kasprzyk.

files: Doc/includes/sqlite3/shared_cache.py Doc/library/imaplib.rst Include/abstract.h Include/pymacconfig.h Lib/SimpleXMLRPCServer.py Lib/csv.py Lib/ctypes/test/test_arrays.py Lib/ctypes/test/test_init.py Lib/ctypes/test/test_numbers.py Lib/ctypes/test/test_win32.py Lib/difflib.py Lib/distutils/cmd.py Lib/distutils/tests/test_clean.py Lib/distutils/tests/test_sdist.py Lib/doctest.py Lib/email/header.py Lib/idlelib/FormatParagraph.py Lib/idlelib/extend.txt Lib/idlelib/macosxSupport.py Lib/imaplib.py Lib/lib-tk/Tix.py Lib/lib-tk/test/test_ttk/test_functions.py Lib/lib-tk/ttk.py Lib/lib-tk/turtle.py Lib/lib2to3/fixes/fix_metaclass.py Lib/lib2to3/pgen2/conv.py Lib/lib2to3/pytree.py Lib/lib2to3/tests/data/py2_test_grammar.py Lib/lib2to3/tests/data/py3_test_grammar.py Lib/ntpath.py Lib/pickletools.py Lib/platform.py Lib/subprocess.py Lib/test/pyclbr_input.py Lib/test/test_builtin.py Lib/test/test_capi.py Lib/test/test_datetime.py Lib/test/test_decimal.py Lib/test/test_descr.py Lib/test/test_doctest.py Lib/test/test_extcall.py Lib/test/test_float.py Lib/test/test_grammar.py Lib/test/test_httpservers.py Lib/test/test_iterlen.py Lib/test/test_itertools.py Lib/test/test_marshal.py Lib/test/test_math.py Lib/test/test_memoryio.py Lib/test/test_mmap.py Lib/test/test_multiprocessing.py Lib/test/test_pep277.py Lib/test/test_pkg.py Lib/test/test_print.py Lib/test/test_strptime.py Lib/test/test_syntax.py Lib/test/test_threading.py Lib/test/test_trace.py Lib/test/test_urllib.py Lib/test/test_warnings.py Lib/unittest/test/test_program.py Lib/xml/dom/minicompat.py Lib/xml/dom/minidom.py Mac/BuildScript/build-installer.py Modules/_ctypes/_ctypes.c Modules/_ctypes/callbacks.c Modules/_ctypes/callproc.c Modules/_functoolsmodule.c Modules/_io/iobase.c Modules/_io/stringio.c Modules/_sqlite/connection.h Modules/cmathmodule.c Modules/socketmodule.c Modules/timemodule.c Modules/zipimport.c Modules/zlib/deflate.h Modules/zlib/gzio.c Objects/dictobject.c Objects/listobject.c Objects/longobject.c Objects/typeobject.c PC/bdist_wininst/extract.c PC/bdist_wininst/install.c PC/os2emx/dlfcn.c PC/os2emx/dlfcn.h Python/ceval.c Python/pystate.c Python/thread.c Tools/freeze/checkextensions_win32.py Tools/scripts/fixcid.py setup.py

diff --git a/Doc/includes/sqlite3/shared_cache.py b/Doc/includes/sqlite3/shared_cache.py --- a/Doc/includes/sqlite3/shared_cache.py +++ b/Doc/includes/sqlite3/shared_cache.py @@ -1,6 +1,6 @@ import sqlite3

The shared cache is only available in SQLite versions 3.3.3 or later

-# See the SQLite documentaton for details. +# See the SQLite documentation for details.

sqlite3.enable_shared_cache(True) diff --git a/Doc/library/imaplib.rst b/Doc/library/imaplib.rst --- a/Doc/library/imaplib.rst +++ b/Doc/library/imaplib.rst @@ -104,7 +104,7 @@ Convert date_time to an IMAP4 INTERNALDATE representation. The return value is a string in the form: "DD-Mmm-YYYY HH:MM:SS +HHMM" (including double-quotes). The date_time argument can be a

@@ -524,7 +524,7 @@ writeable memory location in buffer of size buffer_len.

   0 is returned on success.  buffer and buffer_len are only

diff --git a/Include/pymacconfig.h b/Include/pymacconfig.h --- a/Include/pymacconfig.h +++ b/Include/pymacconfig.h @@ -61,7 +61,7 @@

endif

if defined(LP64)

diff --git a/Lib/SimpleXMLRPCServer.py b/Lib/SimpleXMLRPCServer.py --- a/Lib/SimpleXMLRPCServer.py +++ b/Lib/SimpleXMLRPCServer.py @@ -246,7 +246,7 @@ marshalled data. For backwards compatibility, a dispatch function can be provided as an argument (see comment in SimpleXMLRPCRequestHandler.do_POST) but overriding the

diff --git a/Lib/csv.py b/Lib/csv.py --- a/Lib/csv.py +++ b/Lib/csv.py @@ -281,7 +281,7 @@ an all or nothing approach, so we allow for small variations in this number. 1) build a table of the frequency of each character on every line.

diff --git a/Lib/ctypes/test/test_arrays.py b/Lib/ctypes/test/test_arrays.py --- a/Lib/ctypes/test/test_arrays.py +++ b/Lib/ctypes/test/test_arrays.py @@ -37,7 +37,7 @@ values = [ia[i] for i in range(len(init))] self.assertEqual(values, [0] * len(init))

diff --git a/Lib/ctypes/test/test_init.py b/Lib/ctypes/test/test_init.py --- a/Lib/ctypes/test/test_init.py +++ b/Lib/ctypes/test/test_init.py @@ -27,7 +27,7 @@ self.assertEqual((y.x.a, y.x.b), (0, 0)) self.assertEqual(y.x.new_was_called, False)

diff --git a/Lib/ctypes/test/test_numbers.py b/Lib/ctypes/test/test_numbers.py --- a/Lib/ctypes/test/test_numbers.py +++ b/Lib/ctypes/test/test_numbers.py @@ -157,7 +157,7 @@ def test_int_from_address(self): from array import array for t in signed_types + unsigned_types:

diff --git a/Lib/ctypes/test/test_win32.py b/Lib/ctypes/test/test_win32.py --- a/Lib/ctypes/test/test_win32.py +++ b/Lib/ctypes/test/test_win32.py @@ -17,7 +17,7 @@ # ValueError: Procedure probably called with not enough arguments (4 bytes missing) self.assertRaises(ValueError, IsWindow)

diff --git a/Lib/difflib.py b/Lib/difflib.py --- a/Lib/difflib.py +++ b/Lib/difflib.py @@ -1714,7 +1714,7 @@ line = line.replace(' ','\0') # expand tabs into spaces line = line.expandtabs(self._tabsize)

diff --git a/Lib/distutils/cmd.py b/Lib/distutils/cmd.py --- a/Lib/distutils/cmd.py +++ b/Lib/distutils/cmd.py @@ -377,7 +377,7 @@ dry_run=self.dry_run)

 def move_file (self, src, dst, level=1):

diff --git a/Lib/distutils/tests/test_clean.py b/Lib/distutils/tests/test_clean.py --- a/Lib/distutils/tests/test_clean.py +++ b/Lib/distutils/tests/test_clean.py @@ -39,7 +39,7 @@ self.assertTrue(not os.path.exists(path), '%s was not removed' % path)

diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py --- a/Lib/distutils/tests/test_sdist.py +++ b/Lib/distutils/tests/test_sdist.py @@ -370,7 +370,7 @@ # adding a file self.write_file((self.tmp_dir, 'somecode', 'doc2.txt'), '#')

diff --git a/Lib/doctest.py b/Lib/doctest.py --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -1217,7 +1217,7 @@ # Process each example. for examplenum, example in enumerate(test.examples):

@@ -2186,7 +2186,7 @@ caller can catch the errors and initiate post-mortem debugging.

        The DocTestCase provides a debug method that raises

diff --git a/Lib/email/header.py b/Lib/email/header.py --- a/Lib/email/header.py +++ b/Lib/email/header.py @@ -47,7 +47,7 @@

For use with .match()

fcre = re.compile(r'[\041-\176]+:$')

-# Find a header embeded in a putative header value. Used to check for +# Find a header embedded in a putative header value. Used to check for

header injection attack.

_embeded_header = re.compile(r'\n[^ \t]+:')

diff --git a/Lib/idlelib/FormatParagraph.py b/Lib/idlelib/FormatParagraph.py --- a/Lib/idlelib/FormatParagraph.py +++ b/Lib/idlelib/FormatParagraph.py @@ -54,7 +54,7 @@ # If the block ends in a \n, we dont want the comment # prefix inserted after it. (Im not sure it makes sense to # reformat a comment block that isnt made of complete

diff --git a/Lib/idlelib/extend.txt b/Lib/idlelib/extend.txt --- a/Lib/idlelib/extend.txt +++ b/Lib/idlelib/extend.txt @@ -18,7 +18,7 @@

An IDLE extension class is instantiated with a single argument, `editwin', an EditorWindow instance. The extension cannot assume much -about this argument, but it is guarateed to have the following instance +about this argument, but it is guaranteed to have the following instance variables:

 text	a Text instance (a widget)

diff --git a/Lib/idlelib/macosxSupport.py b/Lib/idlelib/macosxSupport.py --- a/Lib/idlelib/macosxSupport.py +++ b/Lib/idlelib/macosxSupport.py @@ -53,8 +53,8 @@

def addOpenEventSupport(root, flist): """

diff --git a/Lib/imaplib.py b/Lib/imaplib.py --- a/Lib/imaplib.py +++ b/Lib/imaplib.py @@ -1394,7 +1394,7 @@ """Convert date_time to IMAP4 INTERNALDATE representation.

 Return string in form: '"DD-Mmm-YYYY HH:MM:SS +HHMM"'.  The

@@ -576,7 +576,7 @@

class ComboBox(TixWidget): """ComboBox - an Entry field with a dropdown menu. The user can select a

@@ -869,7 +869,7 @@ """HList - Hierarchy display widget can be used to display any data that have a hierarchical structure, for example, file system directory trees. The list entries are indented and connected by branch lines

@@ -1520,7 +1520,7 @@ self.tk.call(self._w, 'selection', 'set', first, last)

class Tree(TixWidget):

diff --git a/Lib/lib-tk/test/test_ttk/test_functions.py b/Lib/lib-tk/test/test_ttk/test_functions.py --- a/Lib/lib-tk/test/test_ttk/test_functions.py +++ b/Lib/lib-tk/test/test_ttk/test_functions.py @@ -136,7 +136,7 @@ # minimum acceptable for image type self.assertEqual(ttk._format_elemcreate('image', False, 'test'), ("test ", ()))

diff --git a/Lib/lib-tk/ttk.py b/Lib/lib-tk/ttk.py --- a/Lib/lib-tk/ttk.py +++ b/Lib/lib-tk/ttk.py @@ -707,7 +707,7 @@ textvariable, values, width """ # The "values" option may need special formatting, so leave to

diff --git a/Lib/lib-tk/turtle.py b/Lib/lib-tk/turtle.py --- a/Lib/lib-tk/turtle.py +++ b/Lib/lib-tk/turtle.py @@ -1409,7 +1409,7 @@ Optional arguments: canvwidth -- positive integer, new width of canvas in pixels canvheight -- positive integer, new height of canvas in pixels

@@ -3079,9 +3079,9 @@ fill="", width=ps) # Turtle now at position old, self._position = old

@@ -3691,7 +3691,7 @@

class Turtle(RawTurtle):

@@ -3731,7 +3731,7 @@ filename -- a string, used as filename default value is turtle_docstringdict

diff --git a/Lib/lib2to3/pgen2/conv.py b/Lib/lib2to3/pgen2/conv.py --- a/Lib/lib2to3/pgen2/conv.py +++ b/Lib/lib2to3/pgen2/conv.py @@ -51,7 +51,7 @@ self.finish_off()

 def parse_graminit_h(self, filename):

@@ -82,7 +82,7 @@ return True

 def parse_graminit_c(self, filename):

diff --git a/Lib/lib2to3/pytree.py b/Lib/lib2to3/pytree.py --- a/Lib/lib2to3/pytree.py +++ b/Lib/lib2to3/pytree.py @@ -658,8 +658,8 @@ content: optional sequence of subsequences of patterns; if absent, matches one node; if present, each subsequence is an alternative [*]

diff --git a/Lib/lib2to3/tests/data/py2_test_grammar.py b/Lib/lib2to3/tests/data/py2_test_grammar.py --- a/Lib/lib2to3/tests/data/py2_test_grammar.py +++ b/Lib/lib2to3/tests/data/py2_test_grammar.py @@ -316,7 +316,7 @@ ### simple_stmt: small_stmt (';' small_stmt)* [';'] x = 1; pass; del x def foo():

diff --git a/Lib/lib2to3/tests/data/py3_test_grammar.py b/Lib/lib2to3/tests/data/py3_test_grammar.py --- a/Lib/lib2to3/tests/data/py3_test_grammar.py +++ b/Lib/lib2to3/tests/data/py3_test_grammar.py @@ -356,7 +356,7 @@ ### simple_stmt: small_stmt (';' small_stmt)* [';'] x = 1; pass; del x def foo():

diff --git a/Lib/ntpath.py b/Lib/ntpath.py --- a/Lib/ntpath.py +++ b/Lib/ntpath.py @@ -310,7 +310,7 @@

- $varname is accepted.

- %varname% is accepted.

- varnames can be made out of letters, digits and the characters '_-'

-# (though is not verifed in the ${varname} and %varname% cases) +# (though is not verified in the ${varname} and %varname% cases)

XXX With COMMAND.COM you can use any characters in a variable name,

XXX except '^|<>='.

diff --git a/Lib/pickletools.py b/Lib/pickletools.py --- a/Lib/pickletools.py +++ b/Lib/pickletools.py @@ -1370,7 +1370,7 @@ proto=0, doc="""Read an object from the memo and push it on the stack.

diff --git a/Lib/platform.py b/Lib/platform.py --- a/Lib/platform.py +++ b/Lib/platform.py @@ -503,7 +503,7 @@ info = pipe.read() if pipe.close(): raise os.error,'command failed'

diff --git a/Lib/subprocess.py b/Lib/subprocess.py --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -883,7 +883,7 @@ except pywintypes.error, e: # Translate pywintypes.error to WindowsError, which is # a subclass of OSError. FIXME: We should really

diff --git a/Lib/test/pyclbr_input.py b/Lib/test/pyclbr_input.py --- a/Lib/test/pyclbr_input.py +++ b/Lib/test/pyclbr_input.py @@ -19,7 +19,7 @@

 # XXX: This causes test_pyclbr.py to fail, but only because the
 #      introspection-based is_method() code in the test can't

diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -693,7 +693,7 @@ # provide too much opportunity for insane things to happen. # We don't want them in the interned dict and if they aren't # actually interned, we don't want to create the appearance

diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py --- a/Lib/test/test_capi.py +++ b/Lib/test/test_capi.py @@ -86,7 +86,7 @@ context.event.set()

 def test_pendingcalls_non_threaded(self):

diff --git a/Lib/test/test_datetime.py b/Lib/test/test_datetime.py --- a/Lib/test/test_datetime.py +++ b/Lib/test/test_datetime.py @@ -3108,7 +3108,7 @@ self.assertEqual(dt, there_and_back)

     # Because we have a redundant spelling when DST begins, there is

diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py --- a/Lib/test/test_decimal.py +++ b/Lib/test/test_decimal.py @@ -231,7 +231,7 @@ try: t = self.eval_line(line) except DecimalException as exception:

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -4282,7 +4282,7 @@ except TypeError: pass else:

diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py --- a/Lib/test/test_doctest.py +++ b/Lib/test/test_doctest.py @@ -1292,7 +1292,7 @@ ? + ++ ^ TestResults(failed=1, attempted=1)

-The REPORT_ONLY_FIRST_FAILURE supresses result output after the first +The REPORT_ONLY_FIRST_FAILURE suppresses result output after the first failing example:

 >>> def f(x):

@@ -1322,7 +1322,7 @@ 2 TestResults(failed=3, attempted=5)

-However, output from report_start is not supressed: +However, output from report_start is not suppressed:

 >>> doctest.DocTestRunner(verbose=True, optionflags=flags).run(test)
 ... # doctest: +ELLIPSIS

@@ -2334,7 +2334,7 @@ TestResults(failed=0, attempted=2) >>> doctest.master = None # Reset master.

-Verbosity can be increased with the optional verbose paremter: +Verbosity can be increased with the optional verbose parameter:

 >>> doctest.testfile('test_doctest.txt', globs=globs, verbose=True)
 Trying:

@@ -2371,7 +2371,7 @@ TestResults(failed=1, attempted=2) >>> doctest.master = None # Reset master.

-The summary report may be supressed with the optional report +The summary report may be suppressed with the optional report parameter:

 >>> doctest.testfile('test_doctest.txt', report=False)

diff --git a/Lib/test/test_extcall.py b/Lib/test/test_extcall.py --- a/Lib/test/test_extcall.py +++ b/Lib/test/test_extcall.py @@ -236,7 +236,7 @@ TypeError: unbound method method() must be called with Foo instance as
first argument (got int instance instead)

-A PyCFunction that takes only positional parameters shoud allow an +A PyCFunction that takes only positional parameters should allow an empty keyword dictionary to pass without a complaint, but raise a TypeError if te dictionary is not empty

diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py --- a/Lib/test/test_float.py +++ b/Lib/test/test_float.py @@ -56,7 +56,7 @@ def test_float_with_comma(self): # set locale to something that doesn't use '.' for the decimal point # float must not accept the locale specific decimal point but

@@ -158,7 +158,7 @@ def assertEqualAndEqualSign(self, a, b): # fail unless a == b and a and b have the same sign bit; # the only difference from assertEqual is that this test

diff --git a/Lib/test/test_grammar.py b/Lib/test/test_grammar.py --- a/Lib/test/test_grammar.py +++ b/Lib/test/test_grammar.py @@ -314,7 +314,7 @@ ### simple_stmt: small_stmt (';' small_stmt)* [';'] x = 1; pass; del x def foo():

diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py --- a/Lib/test/test_httpservers.py +++ b/Lib/test/test_httpservers.py @@ -87,7 +87,7 @@ return self.connection.getresponse()

class BaseHTTPRequestHandlerTestCase(unittest.TestCase):

diff --git a/Lib/test/test_iterlen.py b/Lib/test/test_iterlen.py --- a/Lib/test/test_iterlen.py +++ b/Lib/test/test_iterlen.py @@ -20,11 +20,11 @@

Some containers become temporarily immutable during iteration. This includes dicts, sets, and collections.deque. Their implementation is equally simple -though they need to permantently set their length to zero whenever there is +though they need to permanently set their length to zero whenever there is an attempt to iterate after a length mutation.

The situation slightly more involved whenever an object allows length mutation -during iteration. Lists and sequence iterators are dynanamically updatable. +during iteration. Lists and sequence iterators are dynamically updatable. So, if a list is extended during iteration, the iterator will continue through the new items. If it shrinks to a point before the most recent iteration, then no further items are available and the length is reported at zero. diff --git a/Lib/test/test_itertools.py b/Lib/test/test_itertools.py --- a/Lib/test/test_itertools.py +++ b/Lib/test/test_itertools.py @@ -1475,7 +1475,7 @@ ... return chain(iterable, repeat(None))

def ncycles(iterable, n): -... "Returns the seqeuence elements n times" +... "Returns the sequence elements n times" ... return chain(*repeat(iterable, n))

def dotproduct(vec1, vec2): diff --git a/Lib/test/test_marshal.py b/Lib/test/test_marshal.py --- a/Lib/test/test_marshal.py +++ b/Lib/test/test_marshal.py @@ -252,7 +252,7 @@ # >>> type(loads(dumps(Int()))) # <type 'int'> for typ in (int, long, float, complex, tuple, list, dict, set, frozenset):

diff --git a/Lib/test/test_math.py b/Lib/test/test_math.py --- a/Lib/test/test_math.py +++ b/Lib/test/test_math.py @@ -780,7 +780,7 @@

     # the following tests have been commented out since they don't
     # really belong here:  the implementation of ** for floats is

diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py --- a/Lib/test/test_memoryio.py +++ b/Lib/test/test_memoryio.py @@ -372,7 +372,7 @@

     # Pickle expects the class to be on the module level. Here we use a
     # little hack to allow the PickleTestMemIO class to derive from

diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py --- a/Lib/test/test_mmap.py +++ b/Lib/test/test_mmap.py @@ -590,7 +590,7 @@ m2.close() m1.close()

diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py --- a/Lib/test/test_multiprocessing.py +++ b/Lib/test/test_multiprocessing.py @@ -18,7 +18,7 @@ from test import test_support from StringIO import StringIO _multiprocessing = test_support.import_module('_multiprocessing') -# import threading after _multiprocessing to raise a more revelant error +# import threading after _multiprocessing to raise a more relevant error

message: "No module named _multiprocessing". _multiprocessing is not compiled

without thread support.

import threading @@ -780,7 +780,7 @@ event = self.Event() wait = TimingWrapper(event.wait)

@@ -1705,7 +1705,7 @@

     util.Finalize(None, conn.send, args=('STOP',), exitpriority=-100)

diff --git a/Lib/test/test_pep277.py b/Lib/test/test_pep277.py --- a/Lib/test/test_pep277.py +++ b/Lib/test/test_pep277.py @@ -126,7 +126,7 @@ # NFD (a variant of Unicode NFD form). Normalize the filename to NFC, NFKC, # NFKD in Python is useless, because darwin will normalize it later and so # open(), os.stat(), etc. don't raise any exception.

@@ -145,7 +145,7 @@ # Skip the test on darwin, because darwin uses a normalization different # than Python NFD normalization: filenames are different even if we use # Python NFD normalization.

diff --git a/Lib/test/test_pkg.py b/Lib/test/test_pkg.py --- a/Lib/test/test_pkg.py +++ b/Lib/test/test_pkg.py @@ -54,7 +54,7 @@ if self.root: # Only clean if the test was actually run cleanout(self.root)

diff --git a/Lib/test/test_print.py b/Lib/test/test_print.py --- a/Lib/test/test_print.py +++ b/Lib/test/test_print.py @@ -15,7 +15,7 @@

A dispatch table all 8 combinations of providing

sep, end, and file

I use this machinery so that I'm not just passing default

-# values to print, I'm eiher passing or not passing in the +# values to print, I'm either passing or not passing in the

arguments

dispatch = { (False, False, False): diff --git a/Lib/test/test_strptime.py b/Lib/test/test_strptime.py --- a/Lib/test/test_strptime.py +++ b/Lib/test/test_strptime.py @@ -536,7 +536,7 @@ self.assertIsNot(first_time_re, second_time_re) # Possible test locale is not supported while initial locale is. # If this is the case just suppress the exception and fall-through

diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py --- a/Lib/test/test_syntax.py +++ b/Lib/test/test_syntax.py @@ -266,7 +266,7 @@

Test continue in finally in weird combinations.

-continue in for loop under finally shouuld be ok. +continue in for loop under finally should be ok.

 >>> def test():
 ...     try:

diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -559,7 +559,7 @@ # This acquires the lock and then waits until the child has forked # before returning, which will release the lock soon after. If # someone else tries to fix this test case by acquiring this lock

diff --git a/Lib/test/test_trace.py b/Lib/test/test_trace.py --- a/Lib/test/test_trace.py +++ b/Lib/test/test_trace.py @@ -205,7 +205,7 @@ (self.my_py_filename, firstlineno + 4): 1, }

diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -641,7 +641,7 @@

Just commented them out.

Can't really tell why keep failing in windows and sparc.

-# Everywhere else they work ok, but on those machines, someteimes +# Everywhere else they work ok, but on those machines, sometimes

fail in one of the tests, sometimes in other. I have a linux, and

the tests go ok.

If anybody has one of the problematic enviroments, please help!

diff --git a/Lib/test/test_warnings.py b/Lib/test/test_warnings.py --- a/Lib/test/test_warnings.py +++ b/Lib/test/test_warnings.py @@ -320,7 +320,7 @@ sys.argv = argv

 def test_warn_explicit_type_errors(self):

diff --git a/Lib/unittest/test/test_program.py b/Lib/unittest/test/test_program.py --- a/Lib/unittest/test/test_program.py +++ b/Lib/unittest/test/test_program.py @@ -224,7 +224,7 @@

     program.runTests()

diff --git a/Lib/xml/dom/minicompat.py b/Lib/xml/dom/minicompat.py --- a/Lib/xml/dom/minicompat.py +++ b/Lib/xml/dom/minicompat.py @@ -6,7 +6,7 @@ #

NodeList -- lightest possible NodeList implementation

-# EmptyNodeList -- lightest possible NodeList that is guarateed to +# EmptyNodeList -- lightest possible NodeList that is guaranteed to

remain empty (immutable)

StringTypes -- tuple of defined string types

diff --git a/Lib/xml/dom/minidom.py b/Lib/xml/dom/minidom.py --- a/Lib/xml/dom/minidom.py +++ b/Lib/xml/dom/minidom.py @@ -1875,7 +1875,7 @@ e._call_user_data_handler(operation, n, entity) else: # Note the cloning of Document and DocumentType nodes is

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -362,7 +362,7 @@

def runCommand(commandline): """

diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -34,7 +34,7 @@

  1. _ctypes_callproc is then called with the 'callargs' tuple. _ctypes_callproc first allocates two arrays. The first is an array of 'struct argument' items, the

diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c --- a/Modules/_functoolsmodule.c +++ b/Modules/_functoolsmodule.c @@ -278,7 +278,7 @@ reduce by itself doesn't support getting kwargs in the unpickle operation so we define a setstate that replaces all the information about the partial. If we only replaced part of it someone would use

PyObject * diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c --- a/Modules/_io/iobase.c +++ b/Modules/_io/iobase.c @@ -49,7 +49,7 @@ "stream.\n" "\n" "IOBase also supports the :keyword:with statement. In this example,\n"

diff --git a/Modules/_sqlite/connection.h b/Modules/_sqlite/connection.h --- a/Modules/_sqlite/connection.h +++ b/Modules/_sqlite/connection.h @@ -55,7 +55,7 @@ /* None for autocommit, otherwise a PyString with the isolation level / PyObject isolation_level;

diff --git a/Modules/cmathmodule.c b/Modules/cmathmodule.c --- a/Modules/cmathmodule.c +++ b/Modules/cmathmodule.c @@ -23,7 +23,7 @@ /* CM_LARGE_DOUBLE is used to avoid spurious overflow in the sqrt, log, inverse trig and inverse hyperbolic trig functions. Its log is used in the

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -2329,7 +2329,7 @@

@@ -2527,7 +2527,7 @@

@@ -4413,7 +4413,7 @@

 return 0;  /* Failure */

#else

#endif } @@ -4449,7 +4449,7 @@ as makefile(), dup() and fromfd(). The import of "_socket" may fail with an ImportError exception if os-specific initialization fails. On Windows, this does WINSOCK initialization. When WINSOCK is

diff --git a/Modules/timemodule.c b/Modules/timemodule.c --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -635,7 +635,7 @@ buf.tm_wday = -1; /* sentinel; original value ignored / tt = mktime(&buf); / Return value of -1 does not necessarily mean an error, but tm_wday

diff --git a/Modules/zipimport.c b/Modules/zipimport.c --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -1053,7 +1053,7 @@ }

/* Given a path to a .pyc or .pyo file in the archive, return the

#ifdef SHOW_CONVERSION_COUNTS diff --git a/Objects/listobject.c b/Objects/listobject.c --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -11,7 +11,7 @@ /* Ensure ob_item has room for at least newsize elements, and set

diff --git a/Objects/typeobject.c b/Objects/typeobject.c --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -1054,7 +1054,7 @@ self has a refcount of 0, and if gc ever gets its hands on it (which can happen if any weakref callback gets invoked), it looks like trash to gc too, and gc also tries to delete self

@@ -6345,7 +6345,7 @@ slots compete for the same descriptor (for example both sq_item and mp_subscript generate a getitem descriptor).

-/* XXX Should better explicitely specify +/* XXX Should better explicitly specify

/* Apparently an undocumented feature of zlib: Set windowsize

diff --git a/PC/bdist_wininst/install.c b/PC/bdist_wininst/install.c --- a/PC/bdist_wininst/install.c +++ b/PC/bdist_wininst/install.c @@ -147,7 +147,7 @@ the permissions of the current user. */ HKEY hkey_root = (HKEY)-1;

-BOOL success; /* Installation successfull? / +BOOL success; / Installation successful? */ char *failure_reason = NULL;

HANDLE hBitmap; @@ -765,7 +765,7 @@

 tempname = tempnam(NULL, NULL);
 // We use a static CRT while the Python version we load uses

-/* free dynamicaly-linked library / +/ free dynamically-linked library */ int dlclose(void handle) { int rc; diff --git a/PC/os2emx/dlfcn.h b/PC/os2emx/dlfcn.h --- a/PC/os2emx/dlfcn.h +++ b/PC/os2emx/dlfcn.h @@ -42,7 +42,7 @@ / return a pointer to the `symbol' in DLL */ void *dlsym(void *handle, char *symbol);

-/* free dynamicaly-linked library / +/ free dynamically-linked library */ int dlclose(void *handle);

/* return a string describing last occurred dl error */ diff --git a/Python/ceval.c b/Python/ceval.c --- a/Python/ceval.c +++ b/Python/ceval.c @@ -27,7 +27,7 @@

typedef unsigned long long uint64;

-/* PowerPC suppport. +/* PowerPC support. "ppc" appears to be the preprocessor definition to detect on OS X, whereas "powerpc" appears to be the correct one for Linux with GCC */ @@ -987,7 +987,7 @@ if (--_Py_Ticker < 0) { if (next_instr == SETUP_FINALLY) { / Make the last opcode before

diff --git a/Python/pystate.c b/Python/pystate.c --- a/Python/pystate.c +++ b/Python/pystate.c @@ -463,7 +463,7 @@ /* for i in all interpreters: * for t in all of i's thread states: * if t's frame isn't NULL, map t's id to its frame

#endif

/* Check if we're running on HP-UX and _SC_THREADS is defined. If so, then

diff --git a/Tools/freeze/checkextensions_win32.py b/Tools/freeze/checkextensions_win32.py --- a/Tools/freeze/checkextensions_win32.py +++ b/Tools/freeze/checkextensions_win32.py @@ -7,7 +7,7 @@ we get it just right, a specific freeze application may have specific compiler options anyway (eg, to enable or disable specific functionality)

-So my basic stragtegy is: +So my basic strategy is:

Tokenizing ANSI C (partly)

diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -1061,8 +1061,8 @@ if sys.platform == 'darwin': # In every directory on the search path search for a dynamic # library and then a static library, instead of first looking

-- Repository URL: http://hg.python.org/cpython



More information about the Python-checkins mailing list