From 8d496add74530767cad3aa8b5b371b9a7f0b8498 Mon Sep 17 00:00:00 2001 From: Martin Panter Date: Thu, 2 Jun 2016 10:35:44 +0000 Subject: [PATCH] Issue #27171: Fix typos in documentation, code comments, and tests --- Demo/tkinter/ttk/ttkcalendar.py | 2 +- Include/pymacconfig.h | 2 +- Lib/Cookie.py | 2 +- Lib/_osx_support.py | 12 ++++++------ Lib/_pyio.py | 2 +- Lib/bsddb/test/test_all.py | 2 +- Lib/decimal.py | 2 +- Lib/distutils/tests/test_build_ext.py | 2 +- Lib/hotshot/__init__.py | 2 +- Lib/idlelib/AutoComplete.py | 2 +- Lib/idlelib/MultiCall.py | 2 +- Lib/idlelib/rpc.py | 2 +- Lib/locale.py | 2 +- Lib/pdb.doc | 2 +- Lib/plat-mac/bgenlocations.py | 2 +- Lib/test/test_socket.py | 4 ++-- Lib/test/test_sys_setprofile.py | 2 +- Misc/HISTORY | 2 +- Misc/NEWS | 10 +++++----- Modules/_bsddb.c | 2 +- Modules/ld_so_aix.in | 6 +++--- Modules/readline.c | 2 +- Objects/fileobject.c | 2 +- Tools/bgen/bgen/bgenVariable.py | 2 +- setup.py | 4 ++-- 25 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Demo/tkinter/ttk/ttkcalendar.py b/Demo/tkinter/ttk/ttkcalendar.py index faa45c5b672..f163170baca 100644 --- a/Demo/tkinter/ttk/ttkcalendar.py +++ b/Demo/tkinter/ttk/ttkcalendar.py @@ -191,7 +191,7 @@ class Calendar(ttk.Frame): self._date = self._date - self.timedelta(days=1) self._date = self.datetime(self._date.year, self._date.month, 1) - self._build_calendar() # reconstuct calendar + self._build_calendar() # reconstruct calendar def _next_month(self): """Update calendar to show the next month.""" diff --git a/Include/pymacconfig.h b/Include/pymacconfig.h index 24e7b8dac61..0c28f5c06d1 100644 --- a/Include/pymacconfig.h +++ b/Include/pymacconfig.h @@ -66,7 +66,7 @@ * Therefore surpress the toolbox-glue in 64-bit mode. */ - /* In 64-bit mode setpgrp always has no argments, in 32-bit + /* In 64-bit mode setpgrp always has no arguments, in 32-bit * mode that depends on the compilation environment */ # undef SETPGRP_HAVE_ARG diff --git a/Lib/Cookie.py b/Lib/Cookie.py index b1704d98ccf..108236371ee 100644 --- a/Lib/Cookie.py +++ b/Lib/Cookie.py @@ -190,7 +190,7 @@ as a string. Backwards Compatibility ----------------------- -In order to keep compatibilty with earlier versions of Cookie.py, +In order to keep compatibility with earlier versions of Cookie.py, it is still possible to use Cookie.Cookie() to create a Cookie. In fact, this simply returns a SmartCookie. diff --git a/Lib/_osx_support.py b/Lib/_osx_support.py index 8d3e5d816c6..d2aaae7986a 100644 --- a/Lib/_osx_support.py +++ b/Lib/_osx_support.py @@ -157,7 +157,7 @@ def _find_appropriate_compiler(_config_vars): # gcc-4.2 is either not present, or a copy of 'llvm-gcc' that # miscompiles Python. - # skip checks if the compiler was overriden with a CC env variable + # skip checks if the compiler was overridden with a CC env variable if 'CC' in os.environ: return _config_vars @@ -193,7 +193,7 @@ def _find_appropriate_compiler(_config_vars): if cc != oldcc: # Found a replacement compiler. # Modify config vars using new compiler, if not already explicitly - # overriden by an env variable, preserving additional arguments. + # overridden by an env variable, preserving additional arguments. for cv in _COMPILER_CONFIG_VARS: if cv in _config_vars and cv not in os.environ: cv_split = _config_vars[cv].split() @@ -207,7 +207,7 @@ def _remove_universal_flags(_config_vars): """Remove all universal build arguments from config vars""" for cv in _UNIVERSAL_CONFIG_VARS: - # Do not alter a config var explicitly overriden by env var + # Do not alter a config var explicitly overridden by env var if cv in _config_vars and cv not in os.environ: flags = _config_vars[cv] flags = re.sub('-arch\s+\w+\s', ' ', flags) @@ -228,7 +228,7 @@ def _remove_unsupported_archs(_config_vars): # build extensions on OSX 10.7 and later with the prebuilt # 32-bit installer on the python.org website. - # skip checks if the compiler was overriden with a CC env variable + # skip checks if the compiler was overridden with a CC env variable if 'CC' in os.environ: return _config_vars @@ -244,7 +244,7 @@ def _remove_unsupported_archs(_config_vars): # across Xcode and compiler versions, there is no reliable way # to be sure why it failed. Assume here it was due to lack of # PPC support and remove the related '-arch' flags from each - # config variables not explicitly overriden by an environment + # config variables not explicitly overridden by an environment # variable. If the error was for some other reason, we hope the # failure will show up again when trying to compile an extension # module. @@ -292,7 +292,7 @@ def _check_for_unavailable_sdk(_config_vars): sdk = m.group(1) if not os.path.exists(sdk): for cv in _UNIVERSAL_CONFIG_VARS: - # Do not alter a config var explicitly overriden by env var + # Do not alter a config var explicitly overridden by env var if cv in _config_vars and cv not in os.environ: flags = _config_vars[cv] flags = re.sub(r'-isysroot\s+\S+(?:\s|$)', ' ', flags) diff --git a/Lib/_pyio.py b/Lib/_pyio.py index d8e1ee78183..ccd6ce81866 100644 --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -997,7 +997,7 @@ class BufferedReader(_BufferedIOMixin): break avail += len(chunk) chunks.append(chunk) - # n is more then avail only when an EOF occurred or when + # n is more than avail only when an EOF occurred or when # read() would have blocked. n = min(n, avail) out = b"".join(chunks) diff --git a/Lib/bsddb/test/test_all.py b/Lib/bsddb/test/test_all.py index 004e357a726..529dfadcd15 100644 --- a/Lib/bsddb/test/test_all.py +++ b/Lib/bsddb/test/test_all.py @@ -523,7 +523,7 @@ def get_new_database_path() : return path -# This path can be overriden via "set_test_path_prefix()". +# This path can be overridden via "set_test_path_prefix()". import os, os.path get_new_path.prefix=os.path.join(os.environ.get("TMPDIR", os.path.join(os.sep,"tmp")), "z-Berkeley_DB") diff --git a/Lib/decimal.py b/Lib/decimal.py index 20d9468bf8a..4797a7d91c1 100644 --- a/Lib/decimal.py +++ b/Lib/decimal.py @@ -1082,7 +1082,7 @@ class Decimal(object): def __pos__(self, context=None): """Returns a copy, unless it is a sNaN. - Rounds the number (if more then precision digits) + Rounds the number (if more than precision digits) """ if self._is_special: ans = self._check_nans(context=context) diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py index d380cb6a3d4..3293c4474ec 100644 --- a/Lib/distutils/tests/test_build_ext.py +++ b/Lib/distutils/tests/test_build_ext.py @@ -251,7 +251,7 @@ class BuildExtTestCase(support.TempdirManager, def test_compiler_option(self): # cmd.compiler is an option and - # should not be overriden by a compiler instance + # should not be overridden by a compiler instance # when the command is run dist = Distribution() cmd = build_ext(dist) diff --git a/Lib/hotshot/__init__.py b/Lib/hotshot/__init__.py index 1556ab3f2ba..3692f930339 100644 --- a/Lib/hotshot/__init__.py +++ b/Lib/hotshot/__init__.py @@ -72,7 +72,7 @@ class Profile: Additional positional and keyword arguments may be passed along; the result of the call is returned, and exceptions are - allowed to propogate cleanly, while ensuring that profiling is + allowed to propagate cleanly, while ensuring that profiling is disabled on the way out. """ return self._prof.runcall(func, args, kw) diff --git a/Lib/idlelib/AutoComplete.py b/Lib/idlelib/AutoComplete.py index 5a90d424b6a..9381bdadd15 100644 --- a/Lib/idlelib/AutoComplete.py +++ b/Lib/idlelib/AutoComplete.py @@ -1,6 +1,6 @@ """AutoComplete.py - An IDLE extension for automatically completing names. -This extension can complete either attribute names of file names. It can pop +This extension can complete either attribute names or file names. It can pop a window with all available names, for the user to select from. """ import os diff --git a/Lib/idlelib/MultiCall.py b/Lib/idlelib/MultiCall.py index 31a4fb71afb..a157d7ad284 100644 --- a/Lib/idlelib/MultiCall.py +++ b/Lib/idlelib/MultiCall.py @@ -101,7 +101,7 @@ class _SimpleBinder: self.widget.unbind(self.widgetinst, self.sequence, self.handlerid) # An int in range(1 << len(_modifiers)) represents a combination of modifiers -# (if the least significent bit is on, _modifiers[0] is on, and so on). +# (if the least significant bit is on, _modifiers[0] is on, and so on). # _state_subsets gives for each combination of modifiers, or *state*, # a list of the states which are a subset of it. This list is ordered by the # number of modifiers is the state - the most specific state comes first. diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py index 5c4aabd8a87..43328e72184 100644 --- a/Lib/idlelib/rpc.py +++ b/Lib/idlelib/rpc.py @@ -1,4 +1,4 @@ -"""RPC Implemention, originally written for the Python Idle IDE +"""RPC Implementation, originally written for the Python Idle IDE For security reasons, GvR requested that Idle's Python execution server process connect to the Idle process, which listens for the connection. Since Idle has diff --git a/Lib/locale.py b/Lib/locale.py index 3ce758f1b62..5aab163e5ae 100644 --- a/Lib/locale.py +++ b/Lib/locale.py @@ -16,7 +16,7 @@ import re import operator import functools -# keep a copy of the builtin str type, because 'str' name is overriden +# keep a copy of the builtin str type, because 'str' name is overridden # in globals by a function below _str = str diff --git a/Lib/pdb.doc b/Lib/pdb.doc index 375be2f8be2..c8c1c93c01e 100644 --- a/Lib/pdb.doc +++ b/Lib/pdb.doc @@ -48,7 +48,7 @@ If a file ".pdbrc" exists in your home directory or in the current directory, it is read in and executed as if it had been typed at the debugger prompt. This is particularly useful for aliases. If both files exist, the one in the home directory is read first and aliases -defined there can be overriden by the local file. +defined there can be overridden by the local file. Aside from aliases, the debugger is not directly programmable; but it is implemented as a class from which you can derive your own debugger diff --git a/Lib/plat-mac/bgenlocations.py b/Lib/plat-mac/bgenlocations.py index 38f41592f89..2f535d2bd03 100644 --- a/Lib/plat-mac/bgenlocations.py +++ b/Lib/plat-mac/bgenlocations.py @@ -34,7 +34,7 @@ TOOLBOXDIR="/Users/jack/src/python/Lib/plat-mac/Carbon" # Creator for C files: CREATOR="CWIE" -# The previous definitions can be overriden by creating a module +# The previous definitions can be overridden by creating a module # bgenlocationscustomize.py and putting it in site-packages (or anywere else # on sys.path, actually) try: diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 2387029580c..fe79b829fd4 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -708,7 +708,7 @@ class GeneralModuleTests(unittest.TestCase): pass def check_sendall_interrupted(self, with_timeout): - # socketpair() is not stricly required, but it makes things easier. + # socketpair() is not strictly required, but it makes things easier. if not hasattr(signal, 'alarm') or not hasattr(socket, 'socketpair'): self.skipTest("signal.alarm and socket.socketpair required for this test") # Our signal handlers clobber the C errno by calling a math function @@ -827,7 +827,7 @@ class BasicTCPTest(SocketConnectedTest): self.serv_conn.sendall(big_chunk) @unittest.skipUnless(hasattr(socket, 'fromfd'), - 'socket.fromfd not availble') + 'socket.fromfd not available') def testFromFd(self): # Testing fromfd() fd = self.cli_conn.fileno() diff --git a/Lib/test/test_sys_setprofile.py b/Lib/test/test_sys_setprofile.py index e82559f8fc3..18b013d9106 100644 --- a/Lib/test/test_sys_setprofile.py +++ b/Lib/test/test_sys_setprofile.py @@ -165,7 +165,7 @@ class ProfileHookTestCase(TestCaseBase): (1, 'return', g_ident), ]) - def test_exception_propogation(self): + def test_exception_propagation(self): def f(p): 1./0 def g(p): diff --git a/Misc/HISTORY b/Misc/HISTORY index b8a45761efd..fa0c6236e03 100644 --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -10009,7 +10009,7 @@ Fri Mar 26 22:36:00 1999 Fred Drake * Tools/scripts/dutree.py: During display, if EPIPE is raised, it's probably because a pager was - killed. Discard the error in that case, but propogate it otherwise. + killed. Discard the error in that case, but propagate it otherwise. Fri Mar 26 16:20:45 1999 Guido van Rossum diff --git a/Misc/NEWS b/Misc/NEWS index 1fed4cd5269..c52b2944118 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -2344,8 +2344,8 @@ Library with port None or "0" and flags AI_NUMERICSERV. - Issue #18080: When building a C extension module on OS X, if the compiler - is overriden with the CC environment variable, use the new compiler as - the default for linking if LDSHARED is not also overriden. This restores + is overridden with the CC environment variable, use the new compiler as + the default for linking if LDSHARED is not also overridden. This restores Distutils behavior introduced in 2.7.3 and inadvertently dropped in 2.7.4. - Issue #18071: C extension module builds on OS X could fail with TypeError @@ -5467,7 +5467,7 @@ Extension Modules - Issue #7900: The getgroups(2) system call on MacOSX behaves rather oddly compared to other unix systems. In particular, os.getgroups() does - not reflect any changes made using os.setgroups() but basicly always + not reflect any changes made using os.setgroups() but basically always returns the same information as the id command. os.getgroups() can now return more than 16 groups on MacOSX. @@ -8076,7 +8076,7 @@ Library backported to help facilitate transitions from 2.7 to 3.1. - Issue #1885: distutils: When running sdist with --formats=tar,gztar the tar - file was overriden by the gztar one. + file was overridden by the gztar one. - Issue #4863: distutils.mwerkscompiler has been removed. @@ -8365,7 +8365,7 @@ Build installed. - Issue #5809: Specifying both --enable-framework and --enable-shared is an - error. Configure now explicity tells you about this. + error. Configure now explicitly tells you about this. - Issue #3585: Add pkg-config support. It creates a python-2.7.pc file and a python.pc symlink in the $(LIBDIR)/pkgconfig directory. Patch by Clinton Roy. diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c index a319333b8ea..ed17d39f2eb 100644 --- a/Modules/_bsddb.c +++ b/Modules/_bsddb.c @@ -3686,7 +3686,7 @@ _DB_has_key(DBObject* self, PyObject* keyobj, PyObject* txnobj) /* ** DB_BUFFER_SMALL is only used if we use "get". ** We can drop it when we only use "exists", - ** when we drop suport for Berkeley DB < 4.6. + ** when we drop support for Berkeley DB < 4.6. */ if (err == DB_BUFFER_SMALL || err == 0) { Py_INCREF(Py_True); diff --git a/Modules/ld_so_aix.in b/Modules/ld_so_aix.in index 39251d2cf52..c18ff10f24b 100644 --- a/Modules/ld_so_aix.in +++ b/Modules/ld_so_aix.in @@ -12,7 +12,7 @@ # # ARGUMENTS: Same as for "ld". The following arguments are processed # or supplied by this script (those marked with an asterisk -# can be overriden from command line): +# can be overridden from command line): # # Argument Default value # (*) -o [OutputFileName] -o shr.o @@ -85,7 +85,7 @@ if test ! -n "$*"; then fi # Default import file for Python -# Can be overriden by providing a -bI: argument. +# Can be overridden by providing a -bI: argument. impfile="./python.exp" # Parse arguments @@ -156,7 +156,7 @@ if test -z "$expfile"; then fi # Default entry symbol for Python modules = init[modulename] -# Can be overriden by providing a -e argument. +# Can be overridden by providing a -e argument. if test -z "$entry"; then entry=init`echo $filename | sed "s/module.*//"` fi diff --git a/Modules/readline.c b/Modules/readline.c index e3a5ed14985..1600cd3dd91 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -960,7 +960,7 @@ setup_readline(void) #ifndef __APPLE__ if (!isatty(STDOUT_FILENO)) { - /* Issue #19884: stdout is no a terminal. Disable meta modifier + /* Issue #19884: stdout is not a terminal. Disable meta modifier keys to not write the ANSI sequence "\033[1034h" into stdout. On terminals supporting 8 bit characters like TERM=xterm-256color (which is now the default Fedora since Fedora 18), the meta key is diff --git a/Objects/fileobject.c b/Objects/fileobject.c index 9ae068cfc59..b29da8a5f58 100644 --- a/Objects/fileobject.c +++ b/Objects/fileobject.c @@ -835,7 +835,7 @@ file_truncate(PyFileObject *f, PyObject *args) if (initialpos == -1) goto onioerror; - /* Set newsize to current postion if newsizeobj NULL, else to the + /* Set newsize to current position if newsizeobj NULL, else to the * specified value. */ if (newsizeobj != NULL) { diff --git a/Tools/bgen/bgen/bgenVariable.py b/Tools/bgen/bgen/bgenVariable.py index 0ad24b346f9..566438abefa 100644 --- a/Tools/bgen/bgen/bgenVariable.py +++ b/Tools/bgen/bgen/bgenVariable.py @@ -20,7 +20,7 @@ class Variable: """A Variable holds a type, a name, a transfer mode and flags. - Most of its methods call the correponding type method with the + Most of its methods call the corresponding type method with the variable name. """ diff --git a/setup.py b/setup.py index 052fff86642..aa08ada37af 100644 --- a/setup.py +++ b/setup.py @@ -770,7 +770,7 @@ class PyBuildExt(build_ext): # In every directory on the search path search for a dynamic # library and then a static library, instead of first looking # for dynamic libraries on the entire path. - # This way a staticly linked custom readline gets picked up + # This way a statically linked custom readline gets picked up # before the (possibly broken) dynamic library in /usr/lib. readline_extra_link_args = ('-Wl,-search_paths_first',) else: @@ -1767,7 +1767,7 @@ class PyBuildExt(build_ext): # --with-tcltk-libs="-L/path/to/tcllibs -ltclm.n \ # -L/path/to/tklibs -ltkm.n" # - # These values can also be specified or overriden via make: + # These values can also be specified or overridden via make: # make TCLTK_INCLUDES="..." TCLTK_LIBS="..." # # This can be useful for building and testing tkinter with multiple