changeset: 68503:ee5350f1d0c2 branch: 2.7 parent: 68476:8f0756010720 user: Ezio Melotti date: Tue Mar 15 18:55:01 2011 +0200 files: Lib/SocketServer.py Lib/ctypes/test/test_functions.py Lib/decimal.py Lib/email/mime/application.py Lib/ftplib.py Lib/gettext.py Lib/httplib.py Lib/idlelib/EditorWindow.py Lib/idlelib/HISTORY.txt Lib/lib-tk/Tix.py Lib/lib-tk/Tkinter.py Lib/lib-tk/ttk.py Lib/lib-tk/turtle.py Lib/nntplib.py Lib/test/crashers/recursion_limit_too_high.py Lib/test/test_compile.py Lib/test/test_descr.py Lib/test/test_os.py Lib/test/test_re.py Lib/test/test_string.py Lib/xml/dom/minidom.py Mac/BuildScript/build-installer.py Mac/Tools/pythonw.c Misc/ACKS Modules/_ctypes/callproc.c Modules/_ctypes/libffi/ChangeLog Modules/_ctypes/libffi/src/dlmalloc.c Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c Modules/_heapqmodule.c Modules/_struct.c Modules/parsermodule.c Modules/threadmodule.c Modules/zipimport.c Objects/bytearrayobject.c Objects/longobject.c Objects/stringlib/string_format.h Objects/stringobject.c PC/bdist_wininst/install.c Python/_warnings.c Python/sysmodule.c Tools/msi/msi.py Tools/pybench/pybench.py setup.py description: #11515: fix several typos. Patch by Piotr Kasprzyk. diff -r 8f0756010720 -r ee5350f1d0c2 Lib/SocketServer.py --- a/Lib/SocketServer.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Lib/SocketServer.py Tue Mar 15 18:55:01 2011 +0200 @@ -675,7 +675,7 @@ # A timeout to apply to the request socket, if not None. timeout = None - # Disable nagle algoritm for this socket, if True. + # Disable nagle algorithm for this socket, if True. # Use only when wbufsize != 0, to avoid small packets. disable_nagle_algorithm = False diff -r 8f0756010720 -r ee5350f1d0c2 Lib/ctypes/test/test_functions.py --- a/Lib/ctypes/test/test_functions.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Lib/ctypes/test/test_functions.py Tue Mar 15 18:55:01 2011 +0200 @@ -116,7 +116,7 @@ self.assertEqual(result, 21) self.assertEqual(type(result), int) - # You cannot assing character format codes as restype any longer + # You cannot assign character format codes as restype any longer self.assertRaises(TypeError, setattr, f, "restype", "i") def test_floatresult(self): diff -r 8f0756010720 -r ee5350f1d0c2 Lib/decimal.py --- a/Lib/decimal.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Lib/decimal.py Tue Mar 15 18:55:01 2011 +0200 @@ -5993,7 +5993,7 @@ def _format_align(sign, body, spec): """Given an unpadded, non-aligned numeric string 'body' and sign - string 'sign', add padding and aligment conforming to the given + string 'sign', add padding and alignment conforming to the given format specifier dictionary 'spec' (as produced by parse_format_specifier). diff -r 8f0756010720 -r ee5350f1d0c2 Lib/email/mime/application.py --- a/Lib/email/mime/application.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Lib/email/mime/application.py Tue Mar 15 18:55:01 2011 +0200 @@ -17,7 +17,7 @@ _encoder=encoders.encode_base64, **_params): """Create an application/* type MIME document. - _data is a string containing the raw applicatoin data. + _data is a string containing the raw application data. _subtype is the MIME content type subtype, defaulting to 'octet-stream'. diff -r 8f0756010720 -r ee5350f1d0c2 Lib/ftplib.py --- a/Lib/ftplib.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Lib/ftplib.py Tue Mar 15 18:55:01 2011 +0200 @@ -599,7 +599,7 @@ Usage example: >>> from ftplib import FTP_TLS >>> ftps = FTP_TLS('ftp.python.org') - >>> ftps.login() # login anonimously previously securing control channel + >>> ftps.login() # login anonymously previously securing control channel '230 Guest login ok, access restrictions apply.' >>> ftps.prot_p() # switch to secure data connection '200 Protection level set to P' diff -r 8f0756010720 -r ee5350f1d0c2 Lib/gettext.py --- a/Lib/gettext.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Lib/gettext.py Tue Mar 15 18:55:01 2011 +0200 @@ -316,7 +316,7 @@ # Note: we unconditionally convert both msgids and msgstrs to # Unicode using the character encoding specified in the charset # parameter of the Content-Type header. The gettext documentation - # strongly encourages msgids to be us-ascii, but some appliations + # strongly encourages msgids to be us-ascii, but some applications # require alternative encodings (e.g. Zope's ZCML and ZPT). For # traditional gettext applications, the msgid conversion will # cause no problems since us-ascii should always be a subset of diff -r 8f0756010720 -r ee5350f1d0c2 Lib/httplib.py --- a/Lib/httplib.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Lib/httplib.py Tue Mar 15 18:55:01 2011 +0200 @@ -804,7 +804,7 @@ del self._buffer[:] # If msg and message_body are sent in a single send() call, # it will avoid performance problems caused by the interaction - # between delayed ack and the Nagle algorithim. + # between delayed ack and the Nagle algorithm. if isinstance(message_body, str): msg += message_body message_body = None diff -r 8f0756010720 -r ee5350f1d0c2 Lib/idlelib/EditorWindow.py --- a/Lib/idlelib/EditorWindow.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Lib/idlelib/EditorWindow.py Tue Mar 15 18:55:01 2011 +0200 @@ -102,8 +102,8 @@ self.top = top = WindowList.ListedToplevel(root, menu=self.menubar) if flist: self.tkinter_vars = flist.vars - #self.top.instance_dict makes flist.inversedict avalable to - #configDialog.py so it can access all EditorWindow instaces + #self.top.instance_dict makes flist.inversedict available to + #configDialog.py so it can access all EditorWindow instances self.top.instance_dict = flist.inversedict else: self.tkinter_vars = {} # keys: Tkinter event names diff -r 8f0756010720 -r ee5350f1d0c2 Lib/idlelib/HISTORY.txt --- a/Lib/idlelib/HISTORY.txt Mon Mar 14 18:53:59 2011 -0400 +++ b/Lib/idlelib/HISTORY.txt Tue Mar 15 18:55:01 2011 +0200 @@ -13,7 +13,7 @@ - New tarball released as a result of the 'revitalisation' of the IDLEfork project. -- This release requires python 2.1 or better. Compatability with earlier +- This release requires python 2.1 or better. Compatibility with earlier versions of python (especially ancient ones like 1.5x) is no longer a priority in IDLEfork development. diff -r 8f0756010720 -r ee5350f1d0c2 Lib/lib-tk/Tix.py --- a/Lib/lib-tk/Tix.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Lib/lib-tk/Tix.py Tue Mar 15 18:55:01 2011 +0200 @@ -163,7 +163,7 @@ extensions) exist, then the image type is chosen according to the depth of the X display: xbm images are chosen on monochrome displays and color images are chosen on color displays. By using - tix_ getimage, you can advoid hard coding the pathnames of the + tix_ getimage, you can avoid hard coding the pathnames of the image files in your application. When successful, this command returns the name of the newly created image, which can be used to configure the -image option of the Tk and Tix widgets. diff -r 8f0756010720 -r ee5350f1d0c2 Lib/lib-tk/Tkinter.py --- a/Lib/lib-tk/Tkinter.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Lib/lib-tk/Tkinter.py Tue Mar 15 18:55:01 2011 +0200 @@ -1660,7 +1660,7 @@ class Tk(Misc, Wm): """Toplevel widget of Tk which represents mostly the main window - of an appliation. It has an associated Tcl interpreter.""" + of an application. It has an associated Tcl interpreter.""" _w = '.' def __init__(self, screenName=None, baseName=None, className='Tk', useTk=1, sync=0, use=None): diff -r 8f0756010720 -r ee5350f1d0c2 Lib/lib-tk/ttk.py --- a/Lib/lib-tk/ttk.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Lib/lib-tk/ttk.py Tue Mar 15 18:55:01 2011 +0200 @@ -993,7 +993,7 @@ pane is either an integer index or the name of a managed subwindow. If kw is not given, returns a dict of the pane option values. If option is specified then the value for that option is returned. - Otherwise, sets the options to the correspoding values.""" + Otherwise, sets the options to the corresponding values.""" if option is not None: kw[option] = None return _val_or_dict(kw, self.tk.call, self._w, "pane", pane) diff -r 8f0756010720 -r ee5350f1d0c2 Lib/lib-tk/turtle.py --- a/Lib/lib-tk/turtle.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Lib/lib-tk/turtle.py Tue Mar 15 18:55:01 2011 +0200 @@ -1385,7 +1385,7 @@ Optional argument: picname -- a string, name of a gif-file or "nopic". - If picname is a filename, set the corresponing image as background. + If picname is a filename, set the corresponding image as background. If picname is "nopic", delete backgroundimage, if present. If picname is None, return the filename of the current backgroundimage. @@ -3221,7 +3221,7 @@ def dot(self, size=None, *color): """Draw a dot with diameter size, using color. - Optional argumentS: + Optional arguments: size -- an integer >= 1 (if given) color -- a colorstring or a numeric color tuple diff -r 8f0756010720 -r ee5350f1d0c2 Lib/nntplib.py --- a/Lib/nntplib.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Lib/nntplib.py Tue Mar 15 18:55:01 2011 +0200 @@ -103,7 +103,7 @@ readermode is sometimes necessary if you are connecting to an NNTP server on the local machine and intend to call - reader-specific comamnds, such as `group'. If you get + reader-specific commands, such as `group'. If you get unexpected NNTPPermanentErrors, you might need to set readermode. """ diff -r 8f0756010720 -r ee5350f1d0c2 Lib/test/crashers/recursion_limit_too_high.py --- a/Lib/test/crashers/recursion_limit_too_high.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Lib/test/crashers/recursion_limit_too_high.py Tue Mar 15 18:55:01 2011 +0200 @@ -5,7 +5,7 @@ # file handles. # The point of this example is to show that sys.setrecursionlimit() is a -# hack, and not a robust solution. This example simply exercices a path +# hack, and not a robust solution. This example simply exercises a path # where it takes many C-level recursions, consuming a lot of stack # space, for each Python-level recursion. So 1000 times this amount of # stack space may be too much for standard platforms already. diff -r 8f0756010720 -r ee5350f1d0c2 Lib/test/test_compile.py --- a/Lib/test/test_compile.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Lib/test/test_compile.py Tue Mar 15 18:55:01 2011 +0200 @@ -252,7 +252,7 @@ self.assertEqual(eval("-" + all_one_bits), -18446744073709551615L) else: self.fail("How many bits *does* this machine have???") - # Verify treatment of contant folding on -(sys.maxint+1) + # Verify treatment of constant folding on -(sys.maxint+1) # i.e. -2147483648 on 32 bit platforms. Should return int, not long. self.assertIsInstance(eval("%s" % (-sys.maxint - 1)), int) self.assertIsInstance(eval("%s" % (-sys.maxint - 2)), long) diff -r 8f0756010720 -r ee5350f1d0c2 Lib/test/test_descr.py --- a/Lib/test/test_descr.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Lib/test/test_descr.py Tue Mar 15 18:55:01 2011 +0200 @@ -876,7 +876,7 @@ # see "A Monotonic Superclass Linearization for Dylan", # by Kim Barrett et al. (OOPSLA 1996) def test_consistency_with_epg(self): - # Testing consistentcy with EPG... + # Testing consistency with EPG... class Pane(object): pass class ScrollingMixin(object): pass class EditingMixin(object): pass diff -r 8f0756010720 -r ee5350f1d0c2 Lib/test/test_os.py --- a/Lib/test/test_os.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Lib/test/test_os.py Tue Mar 15 18:55:01 2011 +0200 @@ -243,7 +243,7 @@ except TypeError: pass - # Use the constructr with a too-long tuple. + # Use the constructor with a too-long tuple. try: result2 = os.stat_result((0,1,2,3,4,5,6,7,8,9,10,11,12,13,14)) except TypeError: @@ -290,7 +290,7 @@ except TypeError: pass - # Use the constructr with a too-long tuple. + # Use the constructor with a too-long tuple. try: result2 = os.statvfs_result((0,1,2,3,4,5,6,7,8,9,10,11,12,13,14)) except TypeError: diff -r 8f0756010720 -r ee5350f1d0c2 Lib/test/test_re.py --- a/Lib/test/test_re.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Lib/test/test_re.py Tue Mar 15 18:55:01 2011 +0200 @@ -7,7 +7,7 @@ # Misc tests from Tim Peters' re.doc # WARNING: Don't change details in these tests if you don't know -# what you're doing. Some of these tests were carefuly modeled to +# what you're doing. Some of these tests were carefully modeled to # cover most of the code. import unittest diff -r 8f0756010720 -r ee5350f1d0c2 Lib/test/test_string.py --- a/Lib/test/test_string.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Lib/test/test_string.py Tue Mar 15 18:55:01 2011 +0200 @@ -176,7 +176,7 @@ # test all parameters used class CheckAllUsedFormatter(string.Formatter): def check_unused_args(self, used_args, args, kwargs): - # Track which arguments actuallly got used + # Track which arguments actually got used unused_args = set(kwargs.keys()) unused_args.update(range(0, len(args))) diff -r 8f0756010720 -r ee5350f1d0c2 Lib/xml/dom/minidom.py --- a/Lib/xml/dom/minidom.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Lib/xml/dom/minidom.py Tue Mar 15 18:55:01 2011 +0200 @@ -1446,7 +1446,7 @@ return False def isId(self, aname): - """Returns true iff the named attribte is a DTD-style ID.""" + """Returns true iff the named attribute is a DTD-style ID.""" return False def isIdNS(self, namespaceURI, localName): diff -r 8f0756010720 -r ee5350f1d0c2 Mac/BuildScript/build-installer.py --- a/Mac/BuildScript/build-installer.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Mac/BuildScript/build-installer.py Tue Mar 15 18:55:01 2011 +0200 @@ -100,7 +100,7 @@ ARCHLIST = universal_opts_map[UNIVERSALARCHS] -# Source directory (asume we're in Mac/BuildScript) +# Source directory (assume we're in Mac/BuildScript) SRCDIR = os.path.dirname( os.path.dirname( os.path.dirname( diff -r 8f0756010720 -r ee5350f1d0c2 Mac/Tools/pythonw.c --- a/Mac/Tools/pythonw.c Mon Mar 14 18:53:59 2011 -0400 +++ b/Mac/Tools/pythonw.c Tue Mar 15 18:55:01 2011 +0200 @@ -103,8 +103,8 @@ count = 1; - /* Run the real python executable using the same architure as this - * executable, this allows users to controle the architecture using + /* Run the real python executable using the same architecture as this + * executable, this allows users to control the architecture using * "arch -ppc python" */ diff -r 8f0756010720 -r ee5350f1d0c2 Misc/ACKS --- a/Misc/ACKS Mon Mar 14 18:53:59 2011 -0400 +++ b/Misc/ACKS Tue Mar 15 18:55:01 2011 +0200 @@ -416,6 +416,7 @@ Tamito Kajiyama Peter van Kampen Jacob Kaplan-Moss +Piotr Kasprzyk Lou Kates Hiroaki Kawai Sebastien Keim diff -r 8f0756010720 -r ee5350f1d0c2 Modules/_ctypes/callproc.c --- a/Modules/_ctypes/callproc.c Mon Mar 14 18:53:59 2011 -0400 +++ b/Modules/_ctypes/callproc.c Tue Mar 15 18:55:01 2011 +0200 @@ -54,7 +54,7 @@ So, there are 4 data structures holding processed arguments: - the inargs tuple (in PyCFuncPtr_call) - the callargs tuple (in PyCFuncPtr_call) - - the 'struct argguments' array + - the 'struct arguments' array - the 'void *' array */ diff -r 8f0756010720 -r ee5350f1d0c2 Modules/_ctypes/libffi/ChangeLog --- a/Modules/_ctypes/libffi/ChangeLog Mon Mar 14 18:53:59 2011 -0400 +++ b/Modules/_ctypes/libffi/ChangeLog Tue Mar 15 18:55:01 2011 +0200 @@ -3084,7 +3084,7 @@ 2003-09-18 Kaz Kojima - * src/sh/ffi.c (ffi_prep_args): Take account into the alignement + * src/sh/ffi.c (ffi_prep_args): Take account into the alignment for the register size. (ffi_closure_helper_SYSV): Handle the structure return value address correctly. @@ -3344,7 +3344,7 @@ 2003-02-06 Andreas Tobler * libffi/src/powerpc/darwin_closure.S: - Fix alignement bug, allocate 8 bytes for the result. + Fix alignment bug, allocate 8 bytes for the result. * libffi/src/powerpc/aix_closure.S: Likewise. * libffi/src/powerpc/ffi_darwin.c: diff -r 8f0756010720 -r ee5350f1d0c2 Modules/_ctypes/libffi/src/dlmalloc.c --- a/Modules/_ctypes/libffi/src/dlmalloc.c Mon Mar 14 18:53:59 2011 -0400 +++ b/Modules/_ctypes/libffi/src/dlmalloc.c Tue Mar 15 18:55:01 2011 +0200 @@ -1326,7 +1326,7 @@ return (ptr != 0)? ptr: MFAIL; } -/* This function supports releasing coalesed segments */ +/* This function supports releasing coalesced segments */ static int win32munmap(void* ptr, size_t size) { MEMORY_BASIC_INFORMATION minfo; char* cptr = ptr; @@ -1362,7 +1362,7 @@ #define CALL_MORECORE(S) MFAIL #endif /* HAVE_MORECORE */ -/* mstate bit set if continguous morecore disabled or failed */ +/* mstate bit set if contiguous morecore disabled or failed */ #define USE_NONCONTIGUOUS_BIT (4U) /* segment bit set in create_mspace_with_base */ diff -r 8f0756010720 -r ee5350f1d0c2 Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c --- a/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c Mon Mar 14 18:53:59 2011 -0400 +++ b/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c Tue Mar 15 18:55:01 2011 +0200 @@ -592,7 +592,7 @@ +---------------------------------------+ 160 | result area 8 | +---------------------------------------+ 168 - | alignement to the next multiple of 16 | + | alignment to the next multiple of 16 | SP current --> +---------------------------------------+ 176 <- parent frame | back chain to caller 4 | +---------------------------------------+ 180 diff -r 8f0756010720 -r ee5350f1d0c2 Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c --- a/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c Mon Mar 14 18:53:59 2011 -0400 +++ b/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c Tue Mar 15 18:55:01 2011 +0200 @@ -650,7 +650,7 @@ +---------------------------------------+ 160 | result area 8 | +---------------------------------------+ 168 - | alignement to the next multiple of 16 | + | alignment to the next multiple of 16 | SP current --> +---------------------------------------+ 176 <- parent frame | back chain to caller 4 | +---------------------------------------+ 180 diff -r 8f0756010720 -r ee5350f1d0c2 Modules/_heapqmodule.c --- a/Modules/_heapqmodule.c Mon Mar 14 18:53:59 2011 -0400 +++ b/Modules/_heapqmodule.c Tue Mar 15 18:55:01 2011 +0200 @@ -11,7 +11,7 @@ /* Older implementations of heapq used Py_LE for comparisons. Now, it uses Py_LT so it will match min(), sorted(), and bisect(). Unfortunately, some client code (Twisted for example) relied on Py_LE, so this little function - restores compatability by trying both. + restores compatibility by trying both. */ static int cmp_lt(PyObject *x, PyObject *y) diff -r 8f0756010720 -r ee5350f1d0c2 Modules/_struct.c --- a/Modules/_struct.c Mon Mar 14 18:53:59 2011 -0400 +++ b/Modules/_struct.c Tue Mar 15 18:55:01 2011 +0200 @@ -1162,7 +1162,7 @@ case '>': case '!': /* Network byte order is big-endian */ return bigendian_table; - case '=': { /* Host byte order -- different from native in aligment! */ + case '=': { /* Host byte order -- different from native in alignment! */ int n = 1; char *p = (char *) &n; if (*p == 1) diff -r 8f0756010720 -r ee5350f1d0c2 Modules/parsermodule.c --- a/Modules/parsermodule.c Mon Mar 14 18:53:59 2011 -0400 +++ b/Modules/parsermodule.c Tue Mar 15 18:55:01 2011 +0200 @@ -1629,7 +1629,7 @@ || strcmp(s, ">>=") == 0 || strcmp(s, "**=") == 0); if (!res) - err_string("illegal augmmented assignment operator"); + err_string("illegal augmented assignment operator"); } } else { diff -r 8f0756010720 -r ee5350f1d0c2 Modules/threadmodule.c --- a/Modules/threadmodule.c Mon Mar 14 18:53:59 2011 -0400 +++ b/Modules/threadmodule.c Tue Mar 15 18:55:01 2011 +0200 @@ -447,7 +447,7 @@ self->args, self->kw) < 0) { /* we need to get rid of ldict from thread so we create a new one the next time we do an attr - acces */ + access */ PyDict_DelItem(tdict, self->key); return NULL; } diff -r 8f0756010720 -r ee5350f1d0c2 Modules/zipimport.c --- a/Modules/zipimport.c Mon Mar 14 18:53:59 2011 -0400 +++ b/Modules/zipimport.c Tue Mar 15 18:55:01 2011 +0200 @@ -1106,7 +1106,7 @@ return code; } -/* Get the code object assoiciated with the module specified by +/* Get the code object associated with the module specified by 'fullname'. */ static PyObject * get_module_code(ZipImporter *self, char *fullname, diff -r 8f0756010720 -r ee5350f1d0c2 Objects/bytearrayobject.c --- a/Objects/bytearrayobject.c Mon Mar 14 18:53:59 2011 -0400 +++ b/Objects/bytearrayobject.c Tue Mar 15 18:55:01 2011 +0200 @@ -2291,7 +2291,7 @@ if (it == NULL) return NULL; - /* Try to determine the length of the argument. 32 is abitrary. */ + /* Try to determine the length of the argument. 32 is arbitrary. */ buf_size = _PyObject_LengthHint(arg, 32); if (buf_size == -1) { Py_DECREF(it); diff -r 8f0756010720 -r ee5350f1d0c2 Objects/longobject.c --- a/Objects/longobject.c Mon Mar 14 18:53:59 2011 -0400 +++ b/Objects/longobject.c Tue Mar 15 18:55:01 2011 +0200 @@ -2895,7 +2895,7 @@ * of slices, each with a->ob_size digits, and multiply the slices by a, * one at a time. This gives k_mul balanced inputs to work with, and is * also cache-friendly (we compute one double-width slice of the result - * at a time, then move on, never bactracking except for the helpful + * at a time, then move on, never backtracking except for the helpful * single-width slice overlap between successive partial sums). */ static PyLongObject * diff -r 8f0756010720 -r ee5350f1d0c2 Objects/stringlib/string_format.h --- a/Objects/stringlib/string_format.h Mon Mar 14 18:53:59 2011 -0400 +++ b/Objects/stringlib/string_format.h Tue Mar 15 18:55:01 2011 +0200 @@ -6,7 +6,7 @@ */ -/* Defines for Python 2.6 compatability */ +/* Defines for Python 2.6 compatibility */ #if PY_VERSION_HEX < 0x03000000 #define PyLong_FromSsize_t _PyLong_FromSsize_t #endif diff -r 8f0756010720 -r ee5350f1d0c2 Objects/stringobject.c --- a/Objects/stringobject.c Mon Mar 14 18:53:59 2011 -0400 +++ b/Objects/stringobject.c Tue Mar 15 18:55:01 2011 +0200 @@ -744,7 +744,7 @@ default: *p++ = '\\'; s--; - goto non_esc; /* an arbitry number of unescaped + goto non_esc; /* an arbitrary number of unescaped UTF-8 bytes may follow. */ } } diff -r 8f0756010720 -r ee5350f1d0c2 PC/bdist_wininst/install.c --- a/PC/bdist_wininst/install.c Mon Mar 14 18:53:59 2011 -0400 +++ b/PC/bdist_wininst/install.c Tue Mar 15 18:55:01 2011 +0200 @@ -62,7 +62,7 @@ * instead showing the user an empty listbox to select something from. * * Finish the code so that we can use other python installations - * additionaly to those found in the registry, + * additionally to those found in the registry, * and then #define USE_OTHER_PYTHON_VERSIONS * * - install a help-button, which will display something meaningful diff -r 8f0756010720 -r ee5350f1d0c2 Python/_warnings.c --- a/Python/_warnings.c Mon Mar 14 18:53:59 2011 -0400 +++ b/Python/_warnings.c Tue Mar 15 18:55:01 2011 +0200 @@ -725,7 +725,7 @@ return 0; } -/* PyErr_Warn is only for backwards compatability and will be removed. +/* PyErr_Warn is only for backwards compatibility and will be removed. Use PyErr_WarnEx instead. */ #undef PyErr_Warn diff -r 8f0756010720 -r ee5350f1d0c2 Python/sysmodule.c --- a/Python/sysmodule.c Mon Mar 14 18:53:59 2011 -0400 +++ b/Python/sysmodule.c Tue Mar 15 18:55:01 2011 +0200 @@ -560,7 +560,7 @@ Return information about the running version of Windows as a named tuple.\n\ The members are named: major, minor, build, platform, service_pack,\n\ service_pack_major, service_pack_minor, suite_mask, and product_type. For\n\ -backward compatibiliy, only the first 5 items are available by indexing.\n\ +backward compatibility, only the first 5 items are available by indexing.\n\ All elements are numbers, except service_pack which is a string. Platform\n\ may be 0 for win32s, 1 for Windows 9x/ME, 2 for Windows NT/2000/XP/Vista/7,\n\ 3 for Windows CE. Product_type may be 1 for a workstation, 2 for a domain\n\ diff -r 8f0756010720 -r ee5350f1d0c2 Tools/msi/msi.py --- a/Tools/msi/msi.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Tools/msi/msi.py Tue Mar 15 18:55:01 2011 +0200 @@ -176,7 +176,7 @@ have_mingw = build_mingw_lib(lib_file, def_file, dll_file, mingw_lib) -# Determine the target architechture +# Determine the target architecture dll_path = os.path.join(srcdir, PCBUILD, dll_file) msilib.set_arch_from_file(dll_path) if msilib.pe_type(dll_path) != msilib.pe_type("msisupport.dll"): diff -r 8f0756010720 -r ee5350f1d0c2 Tools/pybench/pybench.py --- a/Tools/pybench/pybench.py Mon Mar 14 18:53:59 2011 -0400 +++ b/Tools/pybench/pybench.py Tue Mar 15 18:55:01 2011 +0200 @@ -689,7 +689,7 @@ other_total_avg_time = other_total_avg_time + other_avg_time if (benchmarks_compatible and test.compatible(other)): - # Both benchmark and tests are comparible + # Both benchmark and tests are comparable min_diff = ((min_time * self.warp) / (other_min_time * other.warp) - 1.0) avg_diff = ((avg_time * self.warp) / @@ -703,7 +703,7 @@ else: avg_diff = '%+5.1f%%' % (avg_diff * PERCENT) else: - # Benchmark or tests are not comparible + # Benchmark or tests are not comparable min_diff, avg_diff = 'n/a', 'n/a' tests_compatible = 0 print '%30s: %5.0fms %5.0fms %7s %5.0fms %5.0fms %7s' % \ diff -r 8f0756010720 -r ee5350f1d0c2 setup.py --- a/setup.py Mon Mar 14 18:53:59 2011 -0400 +++ b/setup.py Tue Mar 15 18:55:01 2011 +0200 @@ -935,7 +935,7 @@ tmp.append(dn) db_dirs_to_check = tmp - # Look for a version specific db-X.Y before an ambiguoius dbX + # Look for a version specific db-X.Y before an ambiguous dbX # XXX should we -ever- look for a dbX name? Do any # systems really not name their library by version and # symlink to more general names?