From 7c4a7e6f3cbd98ad547a3f1661582517612419e3 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Mon, 26 Aug 2013 01:32:56 +0300 Subject: [PATCH] =?UTF-8?q?#18803:=20fix=20more=20typos.=20=20Patch=20by?= =?UTF-8?q?=20F=C3=A9vry=20Thibault.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Mac/BuildScript/build-installer.py | 4 ++-- Modules/unicodedata.c | 2 +- PCbuild/vs9to10.py | 2 +- Parser/asdl_c.py | 2 +- Tools/freeze/checkextensions_win32.py | 4 ++-- Tools/freeze/makefreeze.py | 2 +- Tools/gdb/libpython.py | 2 +- Tools/i18n/msgfmt.py | 2 +- Tools/msi/msilib.py | 2 +- Tools/pybench/CommandLine.py | 2 +- Tools/pybench/systimes.py | 2 +- Tools/pynche/DetailsViewer.py | 2 +- Tools/scripts/fixnotice.py | 2 +- Tools/scripts/ifdef.py | 4 ++-- Tools/scripts/pathfix.py | 2 +- Tools/stringbench/stringbench.py | 2 +- Tools/unicode/makeunicodedata.py | 2 +- 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 004765ae580..ef822d58549 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -108,7 +108,7 @@ DEPSRC = os.path.expanduser('~/Universal/other-sources') ### There are some issues with the SDK selection below here, ### The resulting binary doesn't work on all platforms that ### it should. Always default to the 10.4u SDK until that -### isue is resolved. +### issue is resolved. ### ##if int(os.uname()[2].split('.')[0]) == 8: ## # Explicitly use the 10.4u (universal) SDK when @@ -1015,7 +1015,7 @@ def buildPython(): os.chdir(curdir) if PYTHON_3: - # Remove the 'Current' link, that way we don't accidently mess + # Remove the 'Current' link, that way we don't accidentally mess # with an already installed version of python 2 os.unlink(os.path.join(rootDir, 'Library', 'Frameworks', 'Python.framework', 'Versions', 'Current')) diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c index d89316a3470..75c162656ed 100644 --- a/Modules/unicodedata.c +++ b/Modules/unicodedata.c @@ -507,7 +507,7 @@ nfd_nfkd(PyObject *self, PyObject *input, int k) stackptr = 0; isize = PyUnicode_GET_LENGTH(input); - /* Overallocate atmost 10 characters. */ + /* Overallocate at most 10 characters. */ space = (isize > 10 ? 10 : isize) + isize; osize = space; output = PyMem_Malloc(space * sizeof(Py_UCS4)); diff --git a/PCbuild/vs9to10.py b/PCbuild/vs9to10.py index 8bf832a3a73..eb7dab50b88 100644 --- a/PCbuild/vs9to10.py +++ b/PCbuild/vs9to10.py @@ -1,4 +1,4 @@ -#Run this file after automatic convertsion of the VisualStudio 2008 solution by VisualStudio 2010. +#Run this file after automatic conversion of the VisualStudio 2008 solution by VisualStudio 2010. #This can be done whenever the 2008 solution changes. #It will make the necessary cleanup and updates to the vcxproj files #the .props files need to be maintained by hand if the .vsprops files change diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py index e61aae24d12..0b6c88cc7b6 100755 --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py @@ -1010,7 +1010,7 @@ def has_sequence(types, doing_specialization): class StaticVisitor(PickleVisitor): - CODE = '''Very simple, always emit this static code. Overide CODE''' + CODE = '''Very simple, always emit this static code. Override CODE''' def visit(self, object): self.emit(self.CODE, 0, reflow=False) diff --git a/Tools/freeze/checkextensions_win32.py b/Tools/freeze/checkextensions_win32.py index a41542f20ec..ee446e754aa 100644 --- a/Tools/freeze/checkextensions_win32.py +++ b/Tools/freeze/checkextensions_win32.py @@ -3,7 +3,7 @@ Under Windows it is unlikely the .obj files are of use, as special compiler options are needed (primarily to toggle the behavior of "public" symbols. -I dont consider it worth parsing the MSVC makefiles for compiler options. Even if +I don't consider it worth parsing the MSVC makefiles for compiler options. Even if we get it just right, a specific freeze application may have specific compiler options anyway (eg, to enable or disable specific functionality) @@ -14,7 +14,7 @@ So my basic strategy is: your own). * This description can include: - The MSVC .dsp file for the extension. The .c source file names - are extraced from there. + are extracted from there. - Specific compiler/linker options - Flag to indicate if Unicode compilation is expected. diff --git a/Tools/freeze/makefreeze.py b/Tools/freeze/makefreeze.py index 4cd1e96990d..ef18ec7b286 100644 --- a/Tools/freeze/makefreeze.py +++ b/Tools/freeze/makefreeze.py @@ -61,7 +61,7 @@ def makefreeze(base, dict, debug=0, entry_point=None, fail_import=()): outfp.write('\t{"%s", M_%s, %d},\n' % (mod, mangled, size)) outfp.write('\n') # The following modules have a NULL code pointer, indicating - # that the prozen program should not search for them on the host + # that the frozen program should not search for them on the host # system. Importing them will *always* raise an ImportError. # The zero value size is never used. for mod in fail_import: diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py index 84d4fa31c49..9f5e8b4e2c3 100644 --- a/Tools/gdb/libpython.py +++ b/Tools/gdb/libpython.py @@ -632,7 +632,7 @@ class PyDictObjectPtr(PyObjectPtr): def iteritems(self): ''' Yields a sequence of (PyObjectPtr key, PyObjectPtr value) pairs, - analagous to dict.iteritems() + analogous to dict.iteritems() ''' keys = self.field('ma_keys') values = self.field('ma_values') diff --git a/Tools/i18n/msgfmt.py b/Tools/i18n/msgfmt.py index 7b3a81ff93a..cd90691bf12 100755 --- a/Tools/i18n/msgfmt.py +++ b/Tools/i18n/msgfmt.py @@ -154,7 +154,7 @@ def make(filename, outfile): # This is a message with plural forms elif l.startswith('msgid_plural'): if section != ID: - print('msgid_plural not preceeded by msgid on %s:%d' % (infile, lno), + print('msgid_plural not preceded by msgid on %s:%d' % (infile, lno), file=sys.stderr) sys.exit(1) l = l[12:] diff --git a/Tools/msi/msilib.py b/Tools/msi/msilib.py index f44052ee20e..c208b910749 100644 --- a/Tools/msi/msilib.py +++ b/Tools/msi/msilib.py @@ -305,7 +305,7 @@ def init_database(name, schema, t.create(db) # Fill the validation table add_data(db, "_Validation", schema._Validation_records) - # Initialize the summary information, allowing atmost 20 properties + # Initialize the summary information, allowing at most 20 properties si = db.GetSummaryInformation(20) si.SetProperty(PID_TITLE, "Installation Database") si.SetProperty(PID_SUBJECT, ProductName) diff --git a/Tools/pybench/CommandLine.py b/Tools/pybench/CommandLine.py index 715bc49b58d..073cca0507b 100644 --- a/Tools/pybench/CommandLine.py +++ b/Tools/pybench/CommandLine.py @@ -462,7 +462,7 @@ class Application: handler = getattr(self, handlername) except AttributeError: if value == '': - # count the number of occurances + # count the number of occurrences if optionname in values: values[optionname] = values[optionname] + 1 else: diff --git a/Tools/pybench/systimes.py b/Tools/pybench/systimes.py index 6bc7e80ef46..5e00891feed 100644 --- a/Tools/pybench/systimes.py +++ b/Tools/pybench/systimes.py @@ -5,7 +5,7 @@ This module implements various different strategies for measuring performance timings. It tries to choose the best available method - based on the platforma and available tools. + based on the platform and available tools. On Windows, it is recommended to have the Mark Hammond win32 package installed. Alternatively, the Thomas Heller ctypes diff --git a/Tools/pynche/DetailsViewer.py b/Tools/pynche/DetailsViewer.py index fdc79b749ca..bed11f4f4ef 100644 --- a/Tools/pynche/DetailsViewer.py +++ b/Tools/pynche/DetailsViewer.py @@ -26,7 +26,7 @@ option menu: other side. Thus if red were at 238 and 25 were added to it, red would have the value 7. - Preseve Distance + Preserve Distance When the increment or decrement would send any of the tied variations out of bounds, all tied variations are wrapped as one, so as to preserve the distance between them. Thus if green and blue were tied, diff --git a/Tools/scripts/fixnotice.py b/Tools/scripts/fixnotice.py index aac86977088..ad967f94781 100755 --- a/Tools/scripts/fixnotice.py +++ b/Tools/scripts/fixnotice.py @@ -2,7 +2,7 @@ """(Ostensibly) fix copyright notices in files. -Actually, this sript will simply replace a block of text in a file from one +Actually, this script will simply replace a block of text in a file from one string to another. It will only do this once though, i.e. not globally throughout the file. It writes a backup file and then does an os.rename() dance for atomicity. diff --git a/Tools/scripts/ifdef.py b/Tools/scripts/ifdef.py index 46167ad8436..b1711ce5c16 100755 --- a/Tools/scripts/ifdef.py +++ b/Tools/scripts/ifdef.py @@ -9,11 +9,11 @@ # options. On standard output it writes a copy of the input file(s) # minus those code sections that are suppressed by the selected # combination of defined/undefined symbols. The #if(n)def/#else/#else -# lines themselfs (if the #if(n)def tests for one of the mentioned +# lines themselves (if the #if(n)def tests for one of the mentioned # names) are removed as well. # Features: Arbitrary nesting of recognized and unrecognized -# preprocesor statements works correctly. Unrecognized #if* commands +# preprocessor statements works correctly. Unrecognized #if* commands # are left in place, so it will never remove too much, only too # little. It does accept whitespace around the '#' character. diff --git a/Tools/scripts/pathfix.py b/Tools/scripts/pathfix.py index dd08e0aba38..13ca866a78d 100755 --- a/Tools/scripts/pathfix.py +++ b/Tools/scripts/pathfix.py @@ -151,7 +151,7 @@ def fix(filename): except os.error as msg: err('%s: reset of timestamp failed (%r)\n' % (filename, msg)) return 1 - # Return succes + # Return success return 0 def fixline(line): diff --git a/Tools/stringbench/stringbench.py b/Tools/stringbench/stringbench.py index a0a21fa0b2e..142b3cadc52 100755 --- a/Tools/stringbench/stringbench.py +++ b/Tools/stringbench/stringbench.py @@ -1294,7 +1294,7 @@ def _get_big_s(STR): raise AssertionError # The older replace implementation counted all matches in -# the string even when it only neeed to make one replacement. +# the string even when it only needed to make one replacement. @bench('("A" + ("Z"*128*1024)).replace("A", "BB", 1)', 'quick replace single character match', 10) def quick_replace_single_match(STR): diff --git a/Tools/unicode/makeunicodedata.py b/Tools/unicode/makeunicodedata.py index d83cf634954..bc3d0cb746b 100644 --- a/Tools/unicode/makeunicodedata.py +++ b/Tools/unicode/makeunicodedata.py @@ -966,7 +966,7 @@ class UnicodeData: assert pua_index - NAME_ALIASES_START == len(self.aliases) self.named_sequences = [] - # store named seqences in the PUA 1, in range U+F0100.., + # store named sequences in the PUA 1, in range U+F0100.., # in order to take advantage of the compression and lookup # algorithms used for the other characters.