From b1d867f14965e2369d31a3fcdab5bca34b4d81b4 Mon Sep 17 00:00:00 2001 From: Martin Panter Date: Thu, 26 May 2016 05:28:50 +0000 Subject: [PATCH] Issue #27076: Doc, comment and test function name spelling fixes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Most fixes to Doc/ and Lib/ directories by Ville Skyttä. --- Demo/tkinter/matt/canvas-with-scrollbars.py | 4 ++-- Lib/_osx_support.py | 2 +- Lib/bsddb/test/test_lock.py | 4 ++-- Lib/cgi.py | 2 +- Lib/collections.py | 2 +- Lib/distutils/msvc9compiler.py | 2 +- Lib/distutils/tests/test_unixccompiler.py | 2 +- Lib/email/parser.py | 2 +- Lib/encodings/utf_32.py | 2 +- Lib/lib-tk/ttk.py | 2 +- Lib/lib2to3/btm_utils.py | 2 +- Lib/lib2to3/fixes/fix_metaclass.py | 2 +- Lib/lib2to3/patcomp.py | 2 +- Lib/locale.py | 2 +- Lib/msilib/schema.py | 2 +- Lib/mutex.py | 2 +- Lib/pstats.py | 2 +- Lib/test/test_cookielib.py | 2 +- Lib/test/test_datetime.py | 4 ++-- Lib/test/test_doctest.py | 2 +- Lib/test/test_generators.py | 2 +- Lib/test/test_hashlib.py | 2 +- Lib/test/test_set.py | 2 +- Lib/test/test_socket.py | 2 +- Lib/test/test_telnetlib.py | 4 ++-- Lib/test/test_winsound.py | 2 +- Lib/test/test_zipfile.py | 2 +- Lib/unittest/result.py | 2 +- Lib/wsgiref/headers.py | 2 +- Mac/README | 2 +- Makefile.pre.in | 2 +- Misc/ACKS | 1 + Misc/HISTORY | 6 +++--- Misc/NEWS | 2 +- Modules/datetimemodule.c | 2 +- Modules/sha256module.c | 2 +- Modules/sha512module.c | 2 +- Objects/stringobject.c | 2 +- Python/peephole.c | 2 +- Python/pythonrun.c | 2 +- Tools/compiler/astgen.py | 2 +- Tools/msi/schema.py | 2 +- Tools/msi/uisample.py | 2 +- configure | 2 +- configure.ac | 2 +- 45 files changed, 51 insertions(+), 50 deletions(-) diff --git a/Demo/tkinter/matt/canvas-with-scrollbars.py b/Demo/tkinter/matt/canvas-with-scrollbars.py index 81ef25a88a..8f81cadced 100644 --- a/Demo/tkinter/matt/canvas-with-scrollbars.py +++ b/Demo/tkinter/matt/canvas-with-scrollbars.py @@ -1,7 +1,7 @@ from Tkinter import * -# This example program creates a scroling canvas, and demonstrates -# how to tie scrollbars and canvses together. The mechanism +# This example program creates a scrolling canvas, and demonstrates +# how to tie scrollbars and canvases together. The mechanism # is analogus for listboxes and other widgets with # "xscroll" and "yscroll" configuration options. diff --git a/Lib/_osx_support.py b/Lib/_osx_support.py index 2cd1428a83..8d3e5d816c 100644 --- a/Lib/_osx_support.py +++ b/Lib/_osx_support.py @@ -151,7 +151,7 @@ def _find_appropriate_compiler(_config_vars): # can only be found inside Xcode.app if the "Command Line Tools" # are not installed. # - # Futhermore, the compiler that can be used varies between + # Furthermore, the compiler that can be used varies between # Xcode releases. Up to Xcode 4 it was possible to use 'gcc-4.2' # as the compiler, after that 'clang' should be used because # gcc-4.2 is either not present, or a copy of 'llvm-gcc' that diff --git a/Lib/bsddb/test/test_lock.py b/Lib/bsddb/test/test_lock.py index 10ca8d642d..fd87ea2e74 100644 --- a/Lib/bsddb/test/test_lock.py +++ b/Lib/bsddb/test/test_lock.py @@ -41,7 +41,7 @@ class LockingTestCase(unittest.TestCase): print "locker ID: %s" % anID lock = self.env.lock_get(anID, "some locked thing", db.DB_LOCK_WRITE) if verbose: - print "Aquired lock: %s" % lock + print "Acquired lock: %s" % lock self.env.lock_put(lock) if verbose: print "Released lock: %s" % lock @@ -158,7 +158,7 @@ class LockingTestCase(unittest.TestCase): for i in xrange(1000) : lock = self.env.lock_get(anID, "some locked thing", lockType) if verbose: - print "%s: Aquired %s lock: %s" % (name, lt, lock) + print "%s: Acquired %s lock: %s" % (name, lt, lock) self.env.lock_put(lock) if verbose: diff --git a/Lib/cgi.py b/Lib/cgi.py index 64ba6d16ca..7c51b44db1 100755 --- a/Lib/cgi.py +++ b/Lib/cgi.py @@ -175,7 +175,7 @@ def parse(fp=None, environ=os.environ, keep_blank_values=0, strict_parsing=0): # parse query string function called from urlparse, -# this is done in order to maintain backward compatiblity. +# this is done in order to maintain backward compatibility. def parse_qs(qs, keep_blank_values=0, strict_parsing=0): """Parse a query given as a string argument.""" diff --git a/Lib/collections.py b/Lib/collections.py index 7ecfd4631e..f2ad9726d5 100644 --- a/Lib/collections.py +++ b/Lib/collections.py @@ -314,7 +314,7 @@ def namedtuple(typename, field_names, verbose=False, rename=False): >>> x, y = p # unpack like a regular tuple >>> x, y (11, 22) - >>> p.x + p.y # fields also accessable by name + >>> p.x + p.y # fields also accessible by name 33 >>> d = p._asdict() # convert to a dictionary >>> d['x'] diff --git a/Lib/distutils/msvc9compiler.py b/Lib/distutils/msvc9compiler.py index 22de4baecd..33d3e516e9 100644 --- a/Lib/distutils/msvc9compiler.py +++ b/Lib/distutils/msvc9compiler.py @@ -54,7 +54,7 @@ else: # A map keyed by get_platform() return values to values accepted by # 'vcvarsall.bat'. Note a cross-compile may combine these (eg, 'x86_amd64' is -# the param to cross-compile on x86 targetting amd64.) +# the param to cross-compile on x86 targeting amd64.) PLAT_TO_VCVARS = { 'win32' : 'x86', 'win-amd64' : 'amd64', diff --git a/Lib/distutils/tests/test_unixccompiler.py b/Lib/distutils/tests/test_unixccompiler.py index fec1ea61d3..3b893c14b5 100644 --- a/Lib/distutils/tests/test_unixccompiler.py +++ b/Lib/distutils/tests/test_unixccompiler.py @@ -135,7 +135,7 @@ class UnixCCompilerTestCase(unittest.TestCase): self.assertEqual(self.cc.linker_so[0], 'my_cc') @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for OS X') - def test_osx_explict_ldshared(self): + def test_osx_explicit_ldshared(self): # Issue #18080: # ensure that setting CC env variable does not change # explicit LDSHARED setting for linker diff --git a/Lib/email/parser.py b/Lib/email/parser.py index 2fcaf25456..6dad32a3fc 100644 --- a/Lib/email/parser.py +++ b/Lib/email/parser.py @@ -23,7 +23,7 @@ class Parser: textual representation of the message. The string must be formatted as a block of RFC 2822 headers and header - continuation lines, optionally preceeded by a `Unix-from' header. The + continuation lines, optionally preceded by a `Unix-from' header. The header block is terminated either by the end of the string or by a blank line. diff --git a/Lib/encodings/utf_32.py b/Lib/encodings/utf_32.py index 6c8016fe1b..067e1e201e 100644 --- a/Lib/encodings/utf_32.py +++ b/Lib/encodings/utf_32.py @@ -68,7 +68,7 @@ class IncrementalDecoder(codecs.BufferedIncrementalDecoder): self.decoder = None def getstate(self): - # additonal state info from the base class must be None here, + # additional state info from the base class must be None here, # as it isn't passed along to the caller state = codecs.BufferedIncrementalDecoder.getstate(self)[0] # additional state info we pass to the caller: diff --git a/Lib/lib-tk/ttk.py b/Lib/lib-tk/ttk.py index fe73aef95c..f7d04331fb 100644 --- a/Lib/lib-tk/ttk.py +++ b/Lib/lib-tk/ttk.py @@ -1014,7 +1014,7 @@ class Progressbar(Widget): """Begin autoincrement mode: schedules a recurring timer event that calls method step every interval milliseconds. - interval defaults to 50 milliseconds (20 steps/second) if ommited.""" + interval defaults to 50 milliseconds (20 steps/second) if omitted.""" self.tk.call(self._w, "start", interval) diff --git a/Lib/lib2to3/btm_utils.py b/Lib/lib2to3/btm_utils.py index 2276dc9e96..501f83490e 100644 --- a/Lib/lib2to3/btm_utils.py +++ b/Lib/lib2to3/btm_utils.py @@ -216,7 +216,7 @@ def reduce_tree(node, parent=None): #reduce to None new_node = None elif repeater_node.children[0].value == '+': - #reduce to a single occurence i.e. do nothing + #reduce to a single occurrence i.e. do nothing pass else: #TODO: handle {min, max} repeaters diff --git a/Lib/lib2to3/fixes/fix_metaclass.py b/Lib/lib2to3/fixes/fix_metaclass.py index 8399a13004..45f99374cc 100644 --- a/Lib/lib2to3/fixes/fix_metaclass.py +++ b/Lib/lib2to3/fixes/fix_metaclass.py @@ -25,7 +25,7 @@ from ..fixer_util import Name, syms, Node, Leaf def has_metaclass(parent): """ we have to check the cls_node without changing it. - There are two possiblities: + There are two possibilities: 1) clsdef => suite => simple_stmt => expr_stmt => Leaf('__meta') 2) clsdef => simple_stmt => expr_stmt => Leaf('__meta') """ diff --git a/Lib/lib2to3/patcomp.py b/Lib/lib2to3/patcomp.py index 093e5f9f8d..d31a9dad9a 100644 --- a/Lib/lib2to3/patcomp.py +++ b/Lib/lib2to3/patcomp.py @@ -3,7 +3,7 @@ """Pattern compiler. -The grammer is taken from PatternGrammar.txt. +The grammar is taken from PatternGrammar.txt. The compiler compiles a pattern to a pytree.*Pattern instance. """ diff --git a/Lib/locale.py b/Lib/locale.py index 05f6316e7b..3ce758f1b6 100644 --- a/Lib/locale.py +++ b/Lib/locale.py @@ -1835,7 +1835,7 @@ windows_locale = { 0x1809: "en_IE", # English - Ireland 0x1c09: "en_ZA", # English - South Africa 0x2009: "en_JA", # English - Jamaica - 0x2409: "en_CB", # English - Carribbean + 0x2409: "en_CB", # English - Caribbean 0x2809: "en_BZ", # English - Belize 0x2c09: "en_TT", # English - Trinidad 0x3009: "en_ZW", # English - Zimbabwe diff --git a/Lib/msilib/schema.py b/Lib/msilib/schema.py index 003f04071c..b84eb220f8 100644 --- a/Lib/msilib/schema.py +++ b/Lib/msilib/schema.py @@ -731,7 +731,7 @@ _Validation_records = [ (u'CustomAction',u'Type',u'N',1,16383,None, None, None, None, u'The numeric custom action type, consisting of source location, code type, entry, option flags.',), (u'CustomAction',u'Action',u'N',None, None, None, None, u'Identifier',None, u'Primary key, name of action, normally appears in sequence table unless private use.',), (u'CustomAction',u'Source',u'Y',None, None, None, None, u'CustomSource',None, u'The table reference of the source of the code.',), -(u'CustomAction',u'Target',u'Y',None, None, None, None, u'Formatted',None, u'Excecution parameter, depends on the type of custom action',), +(u'CustomAction',u'Target',u'Y',None, None, None, None, u'Formatted',None, u'Execution parameter, depends on the type of custom action',), (u'DrLocator',u'Signature_',u'N',None, None, None, None, u'Identifier',None, u'The Signature_ represents a unique file signature and is also the foreign key in the Signature table.',), (u'DrLocator',u'Path',u'Y',None, None, None, None, u'AnyPath',None, u'The path on the user system. This is a either a subpath below the value of the Parent or a full path. The path may contain properties enclosed within [ ] that will be expanded.',), (u'DrLocator',u'Depth',u'Y',0,32767,None, None, None, None, u'The depth below the path to which the Signature_ is recursively searched. If absent, the depth is assumed to be 0.',), diff --git a/Lib/mutex.py b/Lib/mutex.py index f8acba4a35..3d8f42856e 100644 --- a/Lib/mutex.py +++ b/Lib/mutex.py @@ -9,7 +9,7 @@ the first queue entry is removed and its function(argument) pair called, implying it now has the lock. Of course, no multi-threading is implied -- hence the funny interface -for lock, where a function is called once the lock is aquired. +for lock, where a function is called once the lock is acquired. """ from warnings import warnpy3k warnpy3k("the mutex module has been removed in Python 3.0", stacklevel=2) diff --git a/Lib/pstats.py b/Lib/pstats.py index 4338994e5d..3908f47c0b 100644 --- a/Lib/pstats.py +++ b/Lib/pstats.py @@ -60,7 +60,7 @@ class Stats: """ def __init__(self, *args, **kwds): - # I can't figure out how to explictly specify a stream keyword arg + # I can't figure out how to explicitly specify a stream keyword arg # with *args: # def __init__(self, *args, stream=sys.stdout): ... # so I use **kwds and sqauwk if something unexpected is passed in. diff --git a/Lib/test/test_cookielib.py b/Lib/test/test_cookielib.py index d272d123c9..a6568d7cd6 100644 --- a/Lib/test/test_cookielib.py +++ b/Lib/test/test_cookielib.py @@ -1760,7 +1760,7 @@ class LWPCookieTests(TestCase): key = "%s_after" % cookie.value counter[key] = counter[key] + 1 - # a permanent cookie got lost accidently + # a permanent cookie got lost accidentally self.assertEqual(counter["perm_after"], counter["perm_before"]) # a session cookie hasn't been cleared self.assertEqual(counter["session_after"], 0) diff --git a/Lib/test/test_datetime.py b/Lib/test/test_datetime.py index 19ffbcd572..1f7fb77685 100644 --- a/Lib/test/test_datetime.py +++ b/Lib/test/test_datetime.py @@ -882,7 +882,7 @@ class TestDate(HarmlessMixedComparison, unittest.TestCase): #self.assertRaises(ValueError, t.strftime, "%#") #oh well, some systems just ignore those invalid ones. - #at least, excercise them to make sure that no crashes + #at least, exercise them to make sure that no crashes #are generated for f in ["%e", "%", "%#"]: try: @@ -1992,7 +1992,7 @@ class TestTime(HarmlessMixedComparison, unittest.TestCase): hour_byte + base[1:]) # A mixin for classes with a tzinfo= argument. Subclasses must define -# theclass as a class atribute, and theclass(1, 1, 1, tzinfo=whatever) +# theclass as a class attribute, and theclass(1, 1, 1, tzinfo=whatever) # must be legit (which is true for time and datetime). class TZInfoBase: diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py index 4b27424e76..7cf7d06fd2 100644 --- a/Lib/test/test_doctest.py +++ b/Lib/test/test_doctest.py @@ -322,7 +322,7 @@ containing test: >>> test.lineno + e2.lineno 26 -If the docstring contains inconsistant leading whitespace in the +If the docstring contains inconsistent leading whitespace in the expected output of an example, then `DocTest` will raise a ValueError: >>> docstring = r''' diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py index 27399f7376..5e1a3e52d5 100644 --- a/Lib/test/test_generators.py +++ b/Lib/test/test_generators.py @@ -1094,7 +1094,7 @@ class Queens: # For each square, compute a bit vector of the columns and # diagonals it covers, and for each row compute a function that - # generates the possiblities for the columns in that row. + # generates the possibilities for the columns in that row. self.rowgenerators = [] for i in rangen: rowuses = [(1L << j) | # column ordinal diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py index 76be4610bb..471ebb4dd1 100644 --- a/Lib/test/test_hashlib.py +++ b/Lib/test/test_hashlib.py @@ -408,7 +408,7 @@ class KDFTests(unittest.TestCase): pbkdf2_results = { "sha1": [ - # offical test vectors from RFC 6070 + # official test vectors from RFC 6070 (unhexlify('0c60c80f961f0e71f3a9b524af6012062fe037a6'), None), (unhexlify('ea6c014dc72d6f8ccd1ed92ace1d41f0d8de8957'), None), (unhexlify('4b007901b765489abead49d926f721d065a429c1'), None), diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py index 6baaccf898..62b36bd42c 100644 --- a/Lib/test/test_set.py +++ b/Lib/test/test_set.py @@ -1740,7 +1740,7 @@ class TestGraphs(unittest.TestCase): # http://en.wikipedia.org/wiki/Cuboctahedron # 8 triangular faces and 6 square faces - # 12 indentical vertices each connecting a triangle and square + # 12 identical vertices each connecting a triangle and square g = cube(3) cuboctahedron = linegraph(g) # V( --> {V1, V2, V3, V4} diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 0ce80b9444..4ae1e4116e 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -86,7 +86,7 @@ class ThreadableTest: clientTearDown () Any new test functions within the class must then define - tests in pairs, where the test name is preceeded with a + tests in pairs, where the test name is preceded with a '_' to indicate the client portion of the test. Ex: def testFoo(self): diff --git a/Lib/test/test_telnetlib.py b/Lib/test/test_telnetlib.py index 6c122d7b48..1534e1477e 100644 --- a/Lib/test/test_telnetlib.py +++ b/Lib/test/test_telnetlib.py @@ -248,8 +248,8 @@ class ReadTests(TestCase): func = getattr(telnet, func_name) self.assertRaises(EOFError, func) - # read_eager and read_very_eager make the same gaurantees - # (they behave differently but we only test the gaurantees) + # read_eager and read_very_eager make the same guarantees + # (they behave differently but we only test the guarantees) def test_read_very_eager_A(self): self._test_read_any_eager_A('read_very_eager') def test_read_very_eager_B(self): diff --git a/Lib/test/test_winsound.py b/Lib/test/test_winsound.py index 4208fe71c4..c94a4dc3d3 100644 --- a/Lib/test/test_winsound.py +++ b/Lib/test/test_winsound.py @@ -159,7 +159,7 @@ class PlaySoundTest(unittest.TestCase): ) def test_alias_fallback(self): - # In the absense of the ability to tell if a sound was actually + # In the absence of the ability to tell if a sound was actually # played, this test has two acceptable outcomes: success (no error, # sound was theoretically played; although as issue #19987 shows # a box without a soundcard can "succeed") or RuntimeError. Any diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py index 40033f22f4..4000b30be8 100644 --- a/Lib/test/test_zipfile.py +++ b/Lib/test/test_zipfile.py @@ -184,7 +184,7 @@ class TestsWithSourceFile(unittest.TestCase): for f in (TESTFN2, TemporaryFile(), StringIO()): self.zip_random_open_test(f, zipfile.ZIP_STORED) - def test_univeral_readaheads(self): + def test_universal_readaheads(self): f = StringIO() data = 'a\r\n' * 16 * 1024 diff --git a/Lib/unittest/result.py b/Lib/unittest/result.py index 2cc17d71c8..8af972fac7 100644 --- a/Lib/unittest/result.py +++ b/Lib/unittest/result.py @@ -132,7 +132,7 @@ class TestResult(object): self.skipped.append((test, reason)) def addExpectedFailure(self, test, err): - """Called when an expected failure/error occured.""" + """Called when an expected failure/error occurred.""" self.expectedFailures.append( (test, self._exc_info_to_string(err, test))) diff --git a/Lib/wsgiref/headers.py b/Lib/wsgiref/headers.py index 6c8c60c891..5a95e84c34 100644 --- a/Lib/wsgiref/headers.py +++ b/Lib/wsgiref/headers.py @@ -59,7 +59,7 @@ class Headers: Return None if the header is missing instead of raising an exception. Note that if the header appeared multiple times, the first exactly which - occurrance gets returned is undefined. Use getall() to get all + occurrence gets returned is undefined. Use getall() to get all the values matching a header field name. """ return self.get(name) diff --git a/Mac/README b/Mac/README index 75e450e147..ec2cd2743e 100644 --- a/Mac/README +++ b/Mac/README @@ -54,7 +54,7 @@ OS X specific arguments to configure See the section _`Building and using a universal binary of Python on Mac OS X` for more information. -* ``--with-univeral-archs=VALUE`` +* ``--with-universal-archs=VALUE`` Specify the kind of universal binary that should be created. This option is only valid when ``--enable-universalsdk`` is specified. diff --git a/Makefile.pre.in b/Makefile.pre.in index f65422e2cf..865d754e20 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1273,7 +1273,7 @@ sharedinstall: sharedmods # the Makefile in Mac # # -# This target is here for backward compatiblity, previous versions of Python +# This target is here for backward compatibility, previous versions of Python # hadn't integrated framework installation in the normal install process. frameworkinstall: install diff --git a/Misc/ACKS b/Misc/ACKS index df9ee4a4bd..e586160794 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1290,6 +1290,7 @@ Ng Pheng Siong George Sipe J. Sipprell Kragen Sitaker +Ville Skyttä Michael Sloan Nick Sloan Václav Šmilauer diff --git a/Misc/HISTORY b/Misc/HISTORY index df6e074acd..9545c97b29 100644 --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -15887,7 +15887,7 @@ the first time it is imported. python parser. Corresponding standard library modules token and symbol defines the numeric values of tokens and non-terminal symbols. -* The posix module has aquired new functions setuid(), setgid(), +* The posix module has acquired new functions setuid(), setgid(), execve(), and exec() has been renamed to execv(). * The array module is extended with 8-byte object swaps, the 'i' @@ -15901,7 +15901,7 @@ module can't be decoded by the new version. * For select.select(), a timeout (4th) argument of None means the same as leaving the timeout argument out. -* Module strop (and hence standard library module string) has aquired +* Module strop (and hence standard library module string) has acquired a new function: rindex(). Thanks to Amrit Prem! * Module regex defines a new function symcomp() which uses an extended @@ -17047,7 +17047,7 @@ New features in 0.9.6: to give more useful results for negative operands - Changed/added range checks for long/plain integer shifts - Options found after "-c command" are now passed to the command in sys.argv - (note subtle incompatiblity with "python -c command -- -options"!) + (note subtle incompatibility with "python -c command -- -options"!) - Module stdwin is better protected against touching objects after they've been closed; menus can now also be closed explicitly - Stdwin now uses its own exception (stdwin.error) diff --git a/Misc/NEWS b/Misc/NEWS index 9279a6466e..cae9ff2b46 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -2970,7 +2970,7 @@ Library - Issue #17073: Fix some integer overflows in sqlite3 module. -- Issue #6083: Fix multiple segmentation faults occured when PyArg_ParseTuple +- Issue #6083: Fix multiple segmentation faults occurred when PyArg_ParseTuple parses nested mutating sequence. - Issue #5289: Fix ctypes.util.find_library on Solaris. diff --git a/Modules/datetimemodule.c b/Modules/datetimemodule.c index f733fa1900..e7fd349508 100644 --- a/Modules/datetimemodule.c +++ b/Modules/datetimemodule.c @@ -197,7 +197,7 @@ days_in_month(int year, int month) return _days_in_month[month]; } -/* year, month -> number of days in year preceeding first day of month */ +/* year, month -> number of days in year preceding first day of month */ static int days_before_month(int year, int month) { diff --git a/Modules/sha256module.c b/Modules/sha256module.c index 2ce8d92ca9..8f18faa17a 100644 --- a/Modules/sha256module.c +++ b/Modules/sha256module.c @@ -101,7 +101,7 @@ static void SHAcopy(SHAobject *src, SHAobject *dest) * algorithms in a highly modular and flexible manner. * * The library is free for all purposes without any express - * gurantee it works. + * guarantee it works. * * Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org */ diff --git a/Modules/sha512module.c b/Modules/sha512module.c index d7b3699a26..abc9021805 100644 --- a/Modules/sha512module.c +++ b/Modules/sha512module.c @@ -111,7 +111,7 @@ static void SHAcopy(SHAobject *src, SHAobject *dest) * algorithms in a highly modular and flexible manner. * * The library is free for all purposes without any express - * gurantee it works. + * guarantee it works. * * Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org */ diff --git a/Objects/stringobject.c b/Objects/stringobject.c index f585ffc728..e19df6e9ef 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -1627,7 +1627,7 @@ string_join(PyStringObject *self, PyObject *orig) #ifdef Py_USING_UNICODE if (PyUnicode_Check(item)) { /* Defer to Unicode join. - * CAUTION: There's no gurantee that the + * CAUTION: There's no guarantee that the * original sequence can be iterated over * again, so we must pass seq here. */ diff --git a/Python/peephole.c b/Python/peephole.c index e3bc004ae2..11f6f8861c 100644 --- a/Python/peephole.c +++ b/Python/peephole.c @@ -289,7 +289,7 @@ markblocks(unsigned char *code, Py_ssize_t len) allows us to avoid overflow and sign issues. Likewise, it bails when the lineno table has complex encoding for gaps >= 255. - Optimizations are restricted to simple transformations occuring within a + Optimizations are restricted to simple transformations occurring within a single basic block. All transformations keep the code size the same or smaller. For those that reduce size, the gaps are initially filled with NOPs. Later those NOPs are removed and the jump addresses retargeted in diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 9b5f62d1ef..7b85268c63 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -1919,7 +1919,7 @@ PyOS_setsig(int sig, PyOS_sighandler_t handler) #endif } -/* Deprecated C API functions still provided for binary compatiblity */ +/* Deprecated C API functions still provided for binary compatibility */ #undef PyParser_SimpleParseFile PyAPI_FUNC(node *) diff --git a/Tools/compiler/astgen.py b/Tools/compiler/astgen.py index 1724276add..8298a7f803 100644 --- a/Tools/compiler/astgen.py +++ b/Tools/compiler/astgen.py @@ -1,7 +1,7 @@ """Generate ast module from specification This script generates the ast module from a simple specification, -which makes it easy to accomodate changes in the grammar. This +which makes it easy to accommodate changes in the grammar. This approach would be quite reasonable if the grammar changed often. Instead, it is rather complex to generate the appropriate code. And the Node interface has changed more often than the grammar. diff --git a/Tools/msi/schema.py b/Tools/msi/schema.py index d028a112b7..f721e78dbe 100644 --- a/Tools/msi/schema.py +++ b/Tools/msi/schema.py @@ -731,7 +731,7 @@ _Validation_records = [ (u'CustomAction',u'Type',u'N',1,16383,None, None, None, None, u'The numeric custom action type, consisting of source location, code type, entry, option flags.',), (u'CustomAction',u'Action',u'N',None, None, None, None, u'Identifier',None, u'Primary key, name of action, normally appears in sequence table unless private use.',), (u'CustomAction',u'Source',u'Y',None, None, None, None, u'CustomSource',None, u'The table reference of the source of the code.',), -(u'CustomAction',u'Target',u'Y',None, None, None, None, u'Formatted',None, u'Excecution parameter, depends on the type of custom action',), +(u'CustomAction',u'Target',u'Y',None, None, None, None, u'Formatted',None, u'Execution parameter, depends on the type of custom action',), (u'DrLocator',u'Signature_',u'N',None, None, None, None, u'Identifier',None, u'The Signature_ represents a unique file signature and is also the foreign key in the Signature table.',), (u'DrLocator',u'Path',u'Y',None, None, None, None, u'AnyPath',None, u'The path on the user system. This is a either a subpath below the value of the Parent or a full path. The path may contain properties enclosed within [ ] that will be expanded.',), (u'DrLocator',u'Depth',u'Y',0,32767,None, None, None, None, u'The depth below the path to which the Signature_ is recursively searched. If absent, the depth is assumed to be 0.',), diff --git a/Tools/msi/uisample.py b/Tools/msi/uisample.py index 2bdf59e102..2b316082af 100644 --- a/Tools/msi/uisample.py +++ b/Tools/msi/uisample.py @@ -996,7 +996,7 @@ _Validation = [ (u'CustomAction', u'Type', u'N', 1, 16383, None, None, None, None, u'The numeric custom action type, consisting of source location, code type, entry, option flags.'), (u'CustomAction', u'Action', u'N', None, None, None, None, u'Identifier', None, u'Primary key, name of action, normally appears in sequence table unless private use.'), (u'CustomAction', u'Source', u'Y', None, None, None, None, u'CustomSource', None, u'The table reference of the source of the code.'), -(u'CustomAction', u'Target', u'Y', None, None, None, None, u'Formatted', None, u'Excecution parameter, depends on the type of custom action'), +(u'CustomAction', u'Target', u'Y', None, None, None, None, u'Formatted', None, u'Execution parameter, depends on the type of custom action'), (u'DrLocator', u'Signature_', u'N', None, None, None, None, u'Identifier', None, u'The Signature_ represents a unique file signature and is also the foreign key in the Signature table.'), (u'DrLocator', u'Path', u'Y', None, None, None, None, u'AnyPath', None, u'The path on the user system. This is a either a subpath below the value of the Parent or a full path. The path may contain properties enclosed within [ ] that will be expanded.'), (u'DrLocator', u'Depth', u'Y', 0, 32767, None, None, None, None, u'The depth below the path to which the Signature_ is recursively searched. If absent, the depth is assumed to be 0.'), diff --git a/configure b/configure index 960ee0a3fd..6abe24dff8 100755 --- a/configure +++ b/configure @@ -3378,7 +3378,7 @@ fi # # SGI compilers allow the specification of the both the ABI and the # ISA on the command line. Depending on the values of these switches, -# different and often incompatable code will be generated. +# different and often incompatible code will be generated. # # The SGI_ABI variable can be used to modify the CC and LDFLAGS and # thus supply support for various ABI/ISA combinations. The MACHDEP diff --git a/configure.ac b/configure.ac index 2d3119b4e6..f0082fdfb6 100644 --- a/configure.ac +++ b/configure.ac @@ -479,7 +479,7 @@ fi # # SGI compilers allow the specification of the both the ABI and the # ISA on the command line. Depending on the values of these switches, -# different and often incompatable code will be generated. +# different and often incompatible code will be generated. # # The SGI_ABI variable can be used to modify the CC and LDFLAGS and # thus supply support for various ABI/ISA combinations. The MACHDEP -- 2.50.1