From: Ezio Melotti Date: Sun, 25 Aug 2013 22:31:30 +0000 (+0300) Subject: #18803: fix more typos. Patch by Févry Thibault. X-Git-Tag: v2.7.6rc1~191 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d0f0f299b014e79f6079901b560e938e0c5d8df;p=thirdparty%2FPython%2Fcpython.git #18803: fix more typos. Patch by Févry Thibault. --- diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 004765ae5803..ef822d585495 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 edc811e08111..6f9c7e8e8313 100644 --- a/Modules/unicodedata.c +++ b/Modules/unicodedata.c @@ -506,7 +506,7 @@ nfd_nfkd(PyObject *self, PyObject *input, int k) stackptr = 0; isize = PyUnicode_GET_SIZE(input); - /* Overallocate atmost 10 characters. */ + /* Overallocate at most 10 characters. */ space = (isize > 10 ? 10 : isize) + isize; result = PyUnicode_FromUnicode(NULL, space); if (!result) diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py index 666c48d199ba..7ebc2369e38b 100755 --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py @@ -977,7 +977,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 e5a8b29bb950..8c6444cf5ad8 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 1208b67fe07d..c0f50566b0db 100644 --- a/Tools/freeze/makefreeze.py +++ b/Tools/freeze/makefreeze.py @@ -62,7 +62,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 e12769d7d27c..b4bfdccc32cc 100644 --- a/Tools/gdb/libpython.py +++ b/Tools/gdb/libpython.py @@ -617,7 +617,7 @@ class PyDictObjectPtr(PyObjectPtr): def iteritems(self): ''' Yields a sequence of (PyObjectPtr key, PyObjectPtr value) pairs, - analagous to dict.iteritems() + analogous to dict.iteritems() ''' for i in safe_range(self.field('ma_mask') + 1): ep = self.field('ma_table') + i diff --git a/Tools/i18n/msgfmt.py b/Tools/i18n/msgfmt.py index 8c9b9dc9a341..2502a109c043 100755 --- a/Tools/i18n/msgfmt.py +++ b/Tools/i18n/msgfmt.py @@ -144,7 +144,7 @@ def make(filename, outfile): # This is a message with plural forms elif l.startswith('msgid_plural'): if section != ID: - print >> sys.stderr, 'msgid_plural not preceeded by msgid on %s:%d' %\ + print >> sys.stderr, 'msgid_plural not preceded by msgid on %s:%d' %\ (infile, lno) sys.exit(1) l = l[12:] diff --git a/Tools/msi/msilib.py b/Tools/msi/msilib.py index e02a3e2316f9..760471c37b23 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 6601be5fb518..fde317841e15 100644 --- a/Tools/pybench/CommandLine.py +++ b/Tools/pybench/CommandLine.py @@ -458,7 +458,7 @@ class Application: handler = getattr(self, handlername) except AttributeError: if value == '': - # count the number of occurances + # count the number of occurrences if values.has_key(optionname): values[optionname] = values[optionname] + 1 else: diff --git a/Tools/pybench/systimes.py b/Tools/pybench/systimes.py index 013add278e9a..db1210dee223 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 11a99a6afcab..fb597b59fd86 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 0ae4872003a0..e613b656722b 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 2ed7a6667bdb..5487f1a74be8 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 7f6f191bbeb1..850903a10007 100755 --- a/Tools/scripts/pathfix.py +++ b/Tools/scripts/pathfix.py @@ -135,7 +135,7 @@ def fix(filename): except os.error, msg: err('%s: rename failed (%r)\n' % (filename, msg)) return 1 - # Return succes + # Return success return 0 def fixline(line):