diff options
44 files changed, 51 insertions, 50 deletions
diff --git a/Lib/SocketServer.py b/Lib/SocketServer.py index f0db511d1d..f1fd78b86b 100644 --- a/Lib/SocketServer.py +++ b/Lib/SocketServer.py @@ -675,7 +675,7 @@ class StreamRequestHandler(BaseRequestHandler): # 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 --git a/Lib/ctypes/test/test_functions.py b/Lib/ctypes/test/test_functions.py index 4534815f18..70cf188ed8 100644 --- a/Lib/ctypes/test/test_functions.py +++ b/Lib/ctypes/test/test_functions.py @@ -116,7 +116,7 @@ class FunctionTestCase(unittest.TestCase): 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 --git a/Lib/decimal.py b/Lib/decimal.py index 102fc8e6e5..5e2a750924 100644 --- a/Lib/decimal.py +++ b/Lib/decimal.py @@ -5993,7 +5993,7 @@ def _parse_format_specifier(format_spec, _localeconv=None): 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 --git a/Lib/email/mime/application.py b/Lib/email/mime/application.py index 6f8bb8a823..f5c5905564 100644 --- a/Lib/email/mime/application.py +++ b/Lib/email/mime/application.py @@ -17,7 +17,7 @@ class MIMEApplication(MIMENonMultipart): _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 --git a/Lib/ftplib.py b/Lib/ftplib.py index c1cef8efca..72d31a15e3 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -599,7 +599,7 @@ else: 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 --git a/Lib/gettext.py b/Lib/gettext.py index 9973535ac5..3f4758034c 100644 --- a/Lib/gettext.py +++ b/Lib/gettext.py @@ -316,7 +316,7 @@ class GNUTranslations(NullTranslations): # 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 --git a/Lib/httplib.py b/Lib/httplib.py index 5af0d02955..6e72e2c37e 100644 --- a/Lib/httplib.py +++ b/Lib/httplib.py @@ -804,7 +804,7 @@ class HTTPConnection: 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 --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py index a487302b09..999952aa2d 100644 --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -102,8 +102,8 @@ class EditorWindow(object): 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 --git a/Lib/idlelib/HISTORY.txt b/Lib/idlelib/HISTORY.txt index c0faaad872..01d73ed2ba 100644 --- a/Lib/idlelib/HISTORY.txt +++ b/Lib/idlelib/HISTORY.txt @@ -13,7 +13,7 @@ What's New in IDLEfork 0.8.1? - 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 --git a/Lib/lib-tk/Tix.py b/Lib/lib-tk/Tix.py index c81cc83136..48d604453f 100644 --- a/Lib/lib-tk/Tix.py +++ b/Lib/lib-tk/Tix.py @@ -163,7 +163,7 @@ class tixCommand: 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 --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py index 1516d79b6e..81d3ef2626 100644 --- a/Lib/lib-tk/Tkinter.py +++ b/Lib/lib-tk/Tkinter.py @@ -1660,7 +1660,7 @@ class Wm: 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 --git a/Lib/lib-tk/ttk.py b/Lib/lib-tk/ttk.py index af7878837a..d0762665ff 100644 --- a/Lib/lib-tk/ttk.py +++ b/Lib/lib-tk/ttk.py @@ -993,7 +993,7 @@ class Panedwindow(Widget, Tkinter.PanedWindow): 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 --git a/Lib/lib-tk/turtle.py b/Lib/lib-tk/turtle.py index 23e407d3fb..20d6e90dc2 100644 --- a/Lib/lib-tk/turtle.py +++ b/Lib/lib-tk/turtle.py @@ -1385,7 +1385,7 @@ class TurtleScreen(TurtleScreenBase): 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 @@ class RawTurtle(TPen, TNavigator): 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 --git a/Lib/nntplib.py b/Lib/nntplib.py index f519b06e55..2dc82a90ae 100644 --- a/Lib/nntplib.py +++ b/Lib/nntplib.py @@ -103,7 +103,7 @@ class NNTP: 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 --git a/Lib/test/crashers/recursion_limit_too_high.py b/Lib/test/crashers/recursion_limit_too_high.py index 1fa4d32543..ec64936a5d 100644 --- a/Lib/test/crashers/recursion_limit_too_high.py +++ b/Lib/test/crashers/recursion_limit_too_high.py @@ -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 --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py index 8a95f6da35..22d1708231 100644 --- a/Lib/test/test_compile.py +++ b/Lib/test/test_compile.py @@ -252,7 +252,7 @@ if 1: 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 --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index c482cacc2b..7d8564180f 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -876,7 +876,7 @@ class ClassPropertiesAndMethods(unittest.TestCase): # 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 --git a/Lib/test/test_os.py b/Lib/test/test_os.py index 6f6862055c..6435b61fdb 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -243,7 +243,7 @@ class StatAttributeTests(unittest.TestCase): 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 @@ class StatAttributeTests(unittest.TestCase): 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 --git a/Lib/test/test_re.py b/Lib/test/test_re.py index f978086dbc..6d06527112 100644 --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -7,7 +7,7 @@ from weakref import proxy # 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 --git a/Lib/test/test_string.py b/Lib/test/test_string.py index 7947e43e9e..0d07b91394 100644 --- a/Lib/test/test_string.py +++ b/Lib/test/test_string.py @@ -176,7 +176,7 @@ class ModuleTest(unittest.TestCase): # 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 --git a/Lib/xml/dom/minidom.py b/Lib/xml/dom/minidom.py index 693d1715df..1712fd2120 100644 --- a/Lib/xml/dom/minidom.py +++ b/Lib/xml/dom/minidom.py @@ -1446,7 +1446,7 @@ class ElementInfo(object): 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 --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index f0b3f3ff5b..0a0c0d6e5d 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -100,7 +100,7 @@ UNIVERSALARCHS = '32-bit' 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 --git a/Mac/Tools/pythonw.c b/Mac/Tools/pythonw.c index 08e069b03c..76734c1063 100644 --- a/Mac/Tools/pythonw.c +++ b/Mac/Tools/pythonw.c @@ -103,8 +103,8 @@ setup_spawnattr(posix_spawnattr_t* spawnattr) 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" */ @@ -416,6 +416,7 @@ Kurt B. Kaiser Tamito Kajiyama Peter van Kampen Jacob Kaplan-Moss +Piotr Kasprzyk Lou Kates Hiroaki Kawai Sebastien Keim diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c index 39fcd16f14..5f62399661 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -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 --git a/Modules/_ctypes/libffi/ChangeLog b/Modules/_ctypes/libffi/ChangeLog index 00ba7efc1d..78853c42f5 100644 --- a/Modules/_ctypes/libffi/ChangeLog +++ b/Modules/_ctypes/libffi/ChangeLog @@ -3084,7 +3084,7 @@ 2003-09-18 Kaz Kojima <kkojima@gcc.gnu.org> - * 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 <a.tobler@schweiz.ch> * 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 --git a/Modules/_ctypes/libffi/src/dlmalloc.c b/Modules/_ctypes/libffi/src/dlmalloc.c index 783c5c2a6f..72673a1bc7 100644 --- a/Modules/_ctypes/libffi/src/dlmalloc.c +++ b/Modules/_ctypes/libffi/src/dlmalloc.c @@ -1326,7 +1326,7 @@ static void* win32direct_mmap(size_t size) { 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 @@ static int win32munmap(void* ptr, size_t size) { #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 --git a/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c b/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c index d84f1c393a..5e7772068a 100644 --- a/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c +++ b/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c @@ -592,7 +592,7 @@ typedef struct aix_fd_struct { +---------------------------------------+ 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 --git a/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c b/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c index 8953d5fda3..dba2184099 100644 --- a/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c +++ b/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c @@ -650,7 +650,7 @@ ffi_call( +---------------------------------------+ 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 --git a/Modules/_heapqmodule.c b/Modules/_heapqmodule.c index 949e5b094d..495114b9a1 100644 --- a/Modules/_heapqmodule.c +++ b/Modules/_heapqmodule.c @@ -11,7 +11,7 @@ annotated by François Pinard, and converted to C by Raymond Hettinger. /* 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 --git a/Modules/_struct.c b/Modules/_struct.c index 71e71dd0e2..c158ebab92 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1162,7 +1162,7 @@ whichtable(char **pfmt) 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 --git a/Modules/parsermodule.c b/Modules/parsermodule.c index f0ac5e9290..632475c986 100644 --- a/Modules/parsermodule.c +++ b/Modules/parsermodule.c @@ -1629,7 +1629,7 @@ validate_expr_stmt(node *tree) || strcmp(s, ">>=") == 0 || strcmp(s, "**=") == 0); if (!res) - err_string("illegal augmmented assignment operator"); + err_string("illegal augmented assignment operator"); } } else { diff --git a/Modules/threadmodule.c b/Modules/threadmodule.c index 53a833c48d..79e6babcd1 100644 --- a/Modules/threadmodule.c +++ b/Modules/threadmodule.c @@ -447,7 +447,7 @@ _ldict(localobject *self) 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 --git a/Modules/zipimport.c b/Modules/zipimport.c index c9acb7d98b..0ca97887db 100644 --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -1106,7 +1106,7 @@ get_code_from_data(ZipImporter *self, int ispackage, int isbytecode, 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 --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c index 86093955d8..6c64b574c4 100644 --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -2291,7 +2291,7 @@ bytearray_extend(PyByteArrayObject *self, PyObject *arg) 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 --git a/Objects/longobject.c b/Objects/longobject.c index fbd18a2dac..05d44b39dc 100644 --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -2895,7 +2895,7 @@ ah*bh and al*bl too. * 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 --git a/Objects/stringlib/string_format.h b/Objects/stringlib/string_format.h index e7bf724b39..075fa1dee9 100644 --- a/Objects/stringlib/string_format.h +++ b/Objects/stringlib/string_format.h @@ -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 --git a/Objects/stringobject.c b/Objects/stringobject.c index 6d3ca8eb82..0a7e78df6d 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -744,7 +744,7 @@ PyObject *PyString_DecodeEscape(const char *s, 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 --git a/PC/bdist_wininst/install.c b/PC/bdist_wininst/install.c index d5472ef9d5..f0230190d4 100644 --- a/PC/bdist_wininst/install.c +++ b/PC/bdist_wininst/install.c @@ -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 --git a/Python/_warnings.c b/Python/_warnings.c index 1dc2512851..88be7db68f 100644 --- a/Python/_warnings.c +++ b/Python/_warnings.c @@ -725,7 +725,7 @@ PyErr_WarnEx(PyObject *category, const char *text, Py_ssize_t stack_level) 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 --git a/Python/sysmodule.c b/Python/sysmodule.c index 56e70e61bb..eeb18f360a 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -560,7 +560,7 @@ PyDoc_STRVAR(getwindowsversion_doc, 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 --git a/Tools/msi/msi.py b/Tools/msi/msi.py index a1f67b84db..5679fdb9a3 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -176,7 +176,7 @@ mingw_lib = os.path.join(srcdir, PCBUILD, "libpython%s%s.a" % (major, minor)) 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 --git a/Tools/pybench/pybench.py b/Tools/pybench/pybench.py index 9dee73194a..76f146875d 100755 --- a/Tools/pybench/pybench.py +++ b/Tools/pybench/pybench.py @@ -689,7 +689,7 @@ class Benchmark: 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 @@ class Benchmark: 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' % \ @@ -935,7 +935,7 @@ class PyBuildExt(build_ext): 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? |