# HG changeset patch # Parent 55e6b4fd0e046bac976926f31cb089fa6651e4c9 Fix typos in documentation, code comments, and tests diff -r 55e6b4fd0e04 Demo/tkinter/ttk/ttkcalendar.py --- a/Demo/tkinter/ttk/ttkcalendar.py Sun Jan 27 06:20:14 2013 +0200 +++ b/Demo/tkinter/ttk/ttkcalendar.py Wed Jun 01 03:51:11 2016 +0000 @@ -191,7 +191,7 @@ 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 -r 55e6b4fd0e04 Include/pymacconfig.h --- a/Include/pymacconfig.h Sun Jan 27 06:20:14 2013 +0200 +++ b/Include/pymacconfig.h Wed Jun 01 03:51:11 2016 +0000 @@ -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 -r 55e6b4fd0e04 Lib/Cookie.py --- a/Lib/Cookie.py Sun Jan 27 06:20:14 2013 +0200 +++ b/Lib/Cookie.py Wed Jun 01 03:51:11 2016 +0000 @@ -190,7 +190,7 @@ 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 -r 55e6b4fd0e04 Lib/_osx_support.py --- a/Lib/_osx_support.py Sun Jan 27 06:20:14 2013 +0200 +++ b/Lib/_osx_support.py Wed Jun 01 03:51:11 2016 +0000 @@ -157,7 +157,7 @@ # 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 @@ 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 @@ """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 @@ # 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 @@ # 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 @@ 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 -r 55e6b4fd0e04 Lib/_pyio.py --- a/Lib/_pyio.py Sun Jan 27 06:20:14 2013 +0200 +++ b/Lib/_pyio.py Wed Jun 01 03:51:11 2016 +0000 @@ -997,7 +997,7 @@ 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 -r 55e6b4fd0e04 Lib/bsddb/test/test_all.py --- a/Lib/bsddb/test/test_all.py Sun Jan 27 06:20:14 2013 +0200 +++ b/Lib/bsddb/test/test_all.py Wed Jun 01 03:51:11 2016 +0000 @@ -523,7 +523,7 @@ 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 -r 55e6b4fd0e04 Lib/decimal.py --- a/Lib/decimal.py Sun Jan 27 06:20:14 2013 +0200 +++ b/Lib/decimal.py Wed Jun 01 03:51:11 2016 +0000 @@ -1082,7 +1082,7 @@ 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 -r 55e6b4fd0e04 Lib/distutils/tests/test_build_ext.py --- a/Lib/distutils/tests/test_build_ext.py Sun Jan 27 06:20:14 2013 +0200 +++ b/Lib/distutils/tests/test_build_ext.py Wed Jun 01 03:51:11 2016 +0000 @@ -251,7 +251,7 @@ 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 -r 55e6b4fd0e04 Lib/hotshot/__init__.py --- a/Lib/hotshot/__init__.py Sun Jan 27 06:20:14 2013 +0200 +++ b/Lib/hotshot/__init__.py Wed Jun 01 03:51:11 2016 +0000 @@ -72,7 +72,7 @@ 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 -r 55e6b4fd0e04 Lib/idlelib/AutoComplete.py --- a/Lib/idlelib/AutoComplete.py Sun Jan 27 06:20:14 2013 +0200 +++ b/Lib/idlelib/AutoComplete.py Wed Jun 01 03:51:11 2016 +0000 @@ -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 -r 55e6b4fd0e04 Lib/idlelib/MultiCall.py --- a/Lib/idlelib/MultiCall.py Sun Jan 27 06:20:14 2013 +0200 +++ b/Lib/idlelib/MultiCall.py Wed Jun 01 03:51:11 2016 +0000 @@ -101,7 +101,7 @@ 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 -r 55e6b4fd0e04 Lib/idlelib/rpc.py --- a/Lib/idlelib/rpc.py Sun Jan 27 06:20:14 2013 +0200 +++ b/Lib/idlelib/rpc.py Wed Jun 01 03:51:11 2016 +0000 @@ -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 -r 55e6b4fd0e04 Lib/locale.py --- a/Lib/locale.py Sun Jan 27 06:20:14 2013 +0200 +++ b/Lib/locale.py Wed Jun 01 03:51:11 2016 +0000 @@ -16,7 +16,7 @@ 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 -r 55e6b4fd0e04 Lib/pdb.doc --- a/Lib/pdb.doc Sun Jan 27 06:20:14 2013 +0200 +++ b/Lib/pdb.doc Wed Jun 01 03:51:11 2016 +0000 @@ -48,7 +48,7 @@ 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 -r 55e6b4fd0e04 Lib/plat-mac/bgenlocations.py --- a/Lib/plat-mac/bgenlocations.py Sun Jan 27 06:20:14 2013 +0200 +++ b/Lib/plat-mac/bgenlocations.py Wed Jun 01 03:51:11 2016 +0000 @@ -34,7 +34,7 @@ # 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 -r 55e6b4fd0e04 Lib/test/test_socket.py --- a/Lib/test/test_socket.py Sun Jan 27 06:20:14 2013 +0200 +++ b/Lib/test/test_socket.py Wed Jun 01 03:51:11 2016 +0000 @@ -708,7 +708,7 @@ 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 @@ 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 -r 55e6b4fd0e04 Lib/test/test_sys_setprofile.py --- a/Lib/test/test_sys_setprofile.py Sun Jan 27 06:20:14 2013 +0200 +++ b/Lib/test/test_sys_setprofile.py Wed Jun 01 03:51:11 2016 +0000 @@ -165,7 +165,7 @@ (1, 'return', g_ident), ]) - def test_exception_propogation(self): + def test_exception_propagation(self): def f(p): 1./0 def g(p): diff -r 55e6b4fd0e04 Misc/HISTORY --- a/Misc/HISTORY Sun Jan 27 06:20:14 2013 +0200 +++ b/Misc/HISTORY Wed Jun 01 03:51:11 2016 +0000 @@ -10009,7 +10009,7 @@ * 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 -r 55e6b4fd0e04 Misc/NEWS --- a/Misc/NEWS Sun Jan 27 06:20:14 2013 +0200 +++ b/Misc/NEWS Wed Jun 01 03:51:11 2016 +0000 @@ -2344,8 +2344,8 @@ 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 @@ - 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 @@ 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 @@ 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 -r 55e6b4fd0e04 Modules/_bsddb.c --- a/Modules/_bsddb.c Sun Jan 27 06:20:14 2013 +0200 +++ b/Modules/_bsddb.c Wed Jun 01 03:51:11 2016 +0000 @@ -3686,7 +3686,7 @@ /* ** 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 -r 55e6b4fd0e04 Modules/ld_so_aix.in --- a/Modules/ld_so_aix.in Sun Jan 27 06:20:14 2013 +0200 +++ b/Modules/ld_so_aix.in Wed Jun 01 03:51:11 2016 +0000 @@ -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 @@ 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 @@ 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 -r 55e6b4fd0e04 Modules/readline.c --- a/Modules/readline.c Sun Jan 27 06:20:14 2013 +0200 +++ b/Modules/readline.c Wed Jun 01 03:51:11 2016 +0000 @@ -960,7 +960,7 @@ #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 -r 55e6b4fd0e04 Objects/fileobject.c --- a/Objects/fileobject.c Sun Jan 27 06:20:14 2013 +0200 +++ b/Objects/fileobject.c Wed Jun 01 03:51:11 2016 +0000 @@ -835,7 +835,7 @@ 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 -r 55e6b4fd0e04 Tools/bgen/bgen/bgenVariable.py --- a/Tools/bgen/bgen/bgenVariable.py Sun Jan 27 06:20:14 2013 +0200 +++ b/Tools/bgen/bgen/bgenVariable.py Wed Jun 01 03:51:11 2016 +0000 @@ -20,7 +20,7 @@ """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 -r 55e6b4fd0e04 setup.py --- a/setup.py Sun Jan 27 06:20:14 2013 +0200 +++ b/setup.py Wed Jun 01 03:51:11 2016 +0000 @@ -770,7 +770,7 @@ # 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 @@ # --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