#18705: merge with 3.3.

26 files changed, 49 insertions, 49 deletions

diff --git a/Lib/_osx_support.py b/Lib/_osx_support.py
index 8412e45..3c11943 100644
--- a/Lib/_osx_support.py
+++ b/Lib/_osx_support.py
@@ -53,7 +53,7 @@ def _find_executable(executable, path=None):
 
 
 def _read_output(commandstring):
-    """Output from succesful command execution or None"""
+    """Output from successful command execution or None"""
     # Similar to os.popen(commandstring, "r").read(),
     # but without actually using os.popen because that
     # function is not usable during python bootstrap.
@@ -152,7 +152,7 @@ def _find_appropriate_compiler(_config_vars):
     #    are not installed.
     #
     #    Futhermore, the compiler that can be used varies between
-    #    Xcode releases. Upto Xcode 4 it was possible to use 'gcc-4.2'
+    #    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
     #    miscompiles Python.
@@ -192,7 +192,7 @@ def _find_appropriate_compiler(_config_vars):
 
     if cc != oldcc:
         # Found a replacement compiler.
-        # Modify config vars using new compiler, if not already explictly
+        # Modify config vars using new compiler, if not already explicitly
         # overriden by an env variable, preserving additional arguments.
         for cv in _COMPILER_CONFIG_VARS:
             if cv in _config_vars and cv not in os.environ:
@@ -274,7 +274,7 @@ def _check_for_unavailable_sdk(_config_vars):
     # compile an extension using an SDK that is not present
     # on the current machine it is better to not use an SDK
     # than to fail.  This is particularly important with
-    # the standalong Command Line Tools alternative to a
+    # the standalone Command Line Tools alternative to a
     # full-blown Xcode install since the CLT packages do not
     # provide SDKs.  If the SDK is not present, it is assumed
     # that the header files and dev libs have been installed
@@ -378,7 +378,7 @@ def customize_config_vars(_config_vars):
     compilers are present, i.e. when installing pure
     Python dists.  Customization of compiler paths
     and detection of unavailable archs is deferred
-    until the first extention module build is
+    until the first extension module build is
     requested (in distutils.sysconfig.customize_compiler).
 
     Currently called from distutils.sysconfig
diff --git a/Lib/_strptime.py b/Lib/_strptime.py
index 7520919..3884a67 100644
--- a/Lib/_strptime.py
+++ b/Lib/_strptime.py
@@ -225,7 +225,7 @@ class TimeRE(dict):
         """Convert a list to a regex string for matching a directive.
 
         Want possible matching values to be from longest to shortest.  This
-        prevents the possibility of a match occuring for a value that also
+        prevents the possibility of a match occurring for a value that also
         a substring of a larger value that should have matched (e.g., 'abc'
         matching when 'abcdef' should have been the match).
 
diff --git a/Lib/aifc.py b/Lib/aifc.py
index ae5fd6d..c02c485 100644
--- a/Lib/aifc.py
+++ b/Lib/aifc.py
@@ -123,7 +123,7 @@ It is best to first set all parameters, perhaps possibly the
 compression type, and then write audio frames using writeframesraw.
 When all frames have been written, either call writeframes('') or
 close() to patch up the sizes in the header.
-Marks can be added anytime.  If there are any marks, ypu must call
+Marks can be added anytime.  If there are any marks, you must call
 close() after all frames have been written.
 The close() method is called automatically when the class instance
 is destroyed.
diff --git a/Lib/calendar.py b/Lib/calendar.py
index 3bbf399..02050ea 100644
--- a/Lib/calendar.py
+++ b/Lib/calendar.py
@@ -220,7 +220,7 @@ class Calendar(object):
     def yeardatescalendar(self, year, width=3):
         """
         Return the data for the specified year ready for formatting. The return
-        value is a list of month rows. Each month row contains upto width months.
+        value is a list of month rows. Each month row contains up to width months.
         Each month contains between 4 and 6 weeks and each week contains 1-7
         days. Days are datetime.date objects.
         """
diff --git a/Lib/contextlib.py b/Lib/contextlib.py
index 03c56da..3222ac8 100644
--- a/Lib/contextlib.py
+++ b/Lib/contextlib.py
@@ -142,7 +142,7 @@ class closing(object):
 
 @contextmanager
 def ignored(*exceptions):
-    """Context manager to ignore specifed exceptions
+    """Context manager to ignore specified exceptions
 
          with ignored(OSError):
              os.remove(somefile)
diff --git a/Lib/datetime.py b/Lib/datetime.py
index bc1486c..0423237 100644
--- a/Lib/datetime.py
+++ b/Lib/datetime.py
@@ -49,7 +49,7 @@ def _days_in_month(year, month):
     return _DAYS_IN_MONTH[month]
 
 def _days_before_month(year, 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."
     assert 1 <= month <= 12, 'month must be in 1..12'
     return _DAYS_BEFORE_MONTH[month] + (month > 2 and _is_leap(year))
 
diff --git a/Lib/difflib.py b/Lib/difflib.py
index 8097744..159cbe4 100644
--- a/Lib/difflib.py
+++ b/Lib/difflib.py
@@ -575,7 +575,7 @@ class SequenceMatcher:
     def get_grouped_opcodes(self, n=3):
         """ Isolate change clusters by eliminating ranges with no changes.
 
-        Return a generator of groups with upto n lines of context.
+        Return a generator of groups with up to n lines of context.
         Each group is in the same format as returned by get_opcodes().
 
         >>> from pprint import pprint
@@ -1344,7 +1344,7 @@ def _mdiff(fromlines, tolines, context=None, linejunk=None,
     linejunk -- passed on to ndiff (see ndiff documentation)
     charjunk -- passed on to ndiff (see ndiff documentation)
 
-    This function returns an interator which returns a tuple:
+    This function returns an iterator which returns a tuple:
     (from line tuple, to line tuple, boolean flag)
 
     from/to line tuple -- (line num, line text)
@@ -1946,7 +1946,7 @@ class HtmlDiff(object):
         self._make_prefix()
 
         # change tabs to spaces before it gets more difficult after we insert
-        # markkup
+        # markup
         fromlines,tolines = self._tab_newline_replace(fromlines,tolines)
 
         # create diffs iterator which generates side by side from/to data
diff --git a/Lib/doctest.py b/Lib/doctest.py
index 1d4d329..1c94e75 100644
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -417,7 +417,7 @@ class Example:
         zero-based, with respect to the beginning of the DocTest.
 
       - indent: The example's indentation in the DocTest string.
-        I.e., the number of space characters that preceed the
+        I.e., the number of space characters that precede the
         example's first prompt.
 
       - options: A dictionary mapping from option flags to True or
@@ -897,7 +897,7 @@ class DocTestFinder:
         if '__name__' not in globs:
             globs['__name__'] = '__main__'  # provide a default module name
 
-        # Recursively expore `obj`, extracting DocTests.
+        # Recursively explore `obj`, extracting DocTests.
         tests = []
         self._find(tests, obj, name, module, source_lines, globs, {})
         # Sort the tests by alpha order of names, for consistency in
diff --git a/Lib/enum.py b/Lib/enum.py
index 34eb7b8..5722b5f 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -90,9 +90,9 @@ class _EnumDict(dict):
         super().__setitem__(key, value)
 
 
-# Dummy value for Enum as EnumMeta explicity checks for it, but of course until
-# EnumMeta finishes running the first time the Enum class doesn't exist.  This
-# is also why there are checks in EnumMeta like `if Enum is not None`
+# Dummy value for Enum as EnumMeta explicitly checks for it, but of course
+# until EnumMeta finishes running the first time the Enum class doesn't exist.
+# This is also why there are checks in EnumMeta like `if Enum is not None`
 Enum = None
 
 
diff --git a/Lib/genericpath.py b/Lib/genericpath.py
index 5292aa8..ca4a510 100644
--- a/Lib/genericpath.py
+++ b/Lib/genericpath.py
@@ -23,7 +23,7 @@ def exists(path):
 
 
 # This follows symbolic links, so both islink() and isdir() can be true
-# for the same path ono systems that support symlinks
+# for the same path on systems that support symlinks
 def isfile(path):
     """Test whether a path is a regular file"""
     try:
diff --git a/Lib/inspect.py b/Lib/inspect.py
index 195c9fd..bebeba2 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -47,7 +47,7 @@ from collections import namedtuple, OrderedDict
 
 # Create constants for the compiler flags in Include/code.h
 # We try to get them from dis to avoid duplication, but fall
-# back to hardcording so the dependency is optional
+# back to hardcoding so the dependency is optional
 try:
     from dis import COMPILER_FLAG_NAMES as _flag_names
 except ImportError:
@@ -184,7 +184,7 @@ def isgenerator(object):
     """Return true if the object is a generator.
 
     Generator objects provide these attributes:
-        __iter__        defined to support interation over container
+        __iter__        defined to support iteration over container
         close           raises a new GeneratorExit exception inside the
                         generator to terminate the iteration
         gi_code         code object
diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py
index 39b3f74..eabfd6f 100644
--- a/Lib/ipaddress.py
+++ b/Lib/ipaddress.py
@@ -727,7 +727,7 @@ class _BaseNetwork(_IPAddressBase):
             minus other.
 
         Raises:
-            TypeError: If self and other are of difffering address
+            TypeError: If self and other are of differing address
               versions, or if other is not a network object.
             ValueError: If other is not completely contained by self.
 
@@ -1378,7 +1378,7 @@ class IPv4Network(_BaseV4, _BaseNetwork):
               '192.0.2.1'
               '192.0.2.1/255.255.255.255'
               '192.0.2.1/32'
-              are also functionaly equivalent. That is to say, failing to
+              are also functionally equivalent. That is to say, failing to
               provide a subnetmask will create an object with a mask of /32.
 
               If the mask (portion after the / in the argument) is given in
diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py
index e3ad7d6..ebd068a 100644
--- a/Lib/modulefinder.py
+++ b/Lib/modulefinder.py
@@ -512,7 +512,7 @@ class ModuleFinder:
         # Print modules that may be missing, but then again, maybe not...
         if maybe:
             print()
-            print("Submodules thay appear to be missing, but could also be", end=' ')
+            print("Submodules that appear to be missing, but could also be", end=' ')
             print("global names in the parent package:")
             for name in maybe:
                 mods = sorted(self.badmodules[name].keys())
diff --git a/Lib/optparse.py b/Lib/optparse.py
index 37764d3..22405d5 100644
--- a/Lib/optparse.py
+++ b/Lib/optparse.py
@@ -1463,7 +1463,7 @@ class OptionParser (OptionContainer):
         """_match_long_opt(opt : string) -> string
 
         Determine which long option string 'opt' matches, ie. which one
-        it is an unambiguous abbrevation for.  Raises BadOptionError if
+        it is an unambiguous abbreviation for.  Raises BadOptionError if
         'opt' doesn't unambiguously match any long option string.
         """
         return _match_abbrev(opt, self._long_opt)
diff --git a/Lib/pdb.py b/Lib/pdb.py
index e5596e5..45fe477 100755
--- a/Lib/pdb.py
+++ b/Lib/pdb.py
@@ -1004,7 +1004,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
     def do_run(self, arg):
         """run [args...]
         Restart the debugged python program. If a string is supplied
-        it is splitted with "shlex", and the result is used as the new
+        it is split with "shlex", and the result is used as the new
         sys.argv.  History, breakpoints, actions and debugger options
         are preserved.  "restart" is an alias for "run".
         """
@@ -1361,7 +1361,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
     def do_interact(self, arg):
         """interact
 
-        Start an interative interpreter whose global namespace
+        Start an interactive interpreter whose global namespace
         contains all the (global and local) names found in the current scope.
         """
         ns = self.curframe.f_globals.copy()
diff --git a/Lib/pickletools.py b/Lib/pickletools.py
index 386a95c..f54b902 100644
--- a/Lib/pickletools.py
+++ b/Lib/pickletools.py
@@ -887,7 +887,7 @@ stackslice = StackObject(
                  obtype=StackObject,
                  doc="""An object representing a contiguous slice of the stack.
 
-                 This is used in conjuction with markobject, to represent all
+                 This is used in conjunction with markobject, to represent all
                  of the stack following the topmost markobject.  For example,
                  the POP_MARK opcode changes the stack from
 
@@ -2037,12 +2037,12 @@ def dis(pickle, out=None, memo=None, indentlevel=4, annotate=0):
 
     stack = []          # crude emulation of unpickler stack
     if memo is None:
-        memo = {}       # crude emulation of unpicker memo
+        memo = {}       # crude emulation of unpickler memo
     maxproto = -1       # max protocol number seen
     markstack = []      # bytecode positions of MARK opcodes
     indentchunk = ' ' * indentlevel
     errormsg = None
-    annocol = annotate  # columnt hint for annotations
+    annocol = annotate  # column hint for annotations
     for opcode, arg, pos in genops(pickle):
         if pos is not None:
             print("%5d:" % pos, end=' ', file=out)
diff --git a/Lib/platform.py b/Lib/platform.py
index 81e3147..cbbe6d8 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -230,7 +230,7 @@ def _dist_try_harder(distname,version,id):
                 return 'OpenLinux',pkg[1],id
 
     if os.path.isdir('/usr/lib/setup'):
-        # Check for slackware verson tag file (thanks to Greg Andruk)
+        # Check for slackware version tag file (thanks to Greg Andruk)
         verfiles = os.listdir('/usr/lib/setup')
         for n in range(len(verfiles)-1, -1, -1):
             if verfiles[n][:14] != 'slack-version-':
@@ -282,7 +282,7 @@ def _parse_release_file(firstline):
     if m is not None:
         return tuple(m.groups())
 
-    # Unkown format... take the first two words
+    # Unknown format... take the first two words
     l = firstline.strip().split()
     if l:
         version = l[0]
@@ -649,7 +649,7 @@ def _mac_ver_xml():
     versioninfo=('', '', '')
     machine = os.uname().machine
     if machine in ('ppc', 'Power Macintosh'):
-        # Cannonical name
+        # Canonical name
         machine = 'PowerPC'
 
     return release,versioninfo,machine
@@ -661,7 +661,7 @@ def mac_ver(release='',versioninfo=('','',''),machine=''):
         versioninfo, machine) with versioninfo being a tuple (version,
         dev_stage, non_release_version).
 
-        Entries which cannot be determined are set to the paramter values
+        Entries which cannot be determined are set to the parameter values
         which default to ''. All tuple entries are strings.
     """
 
diff --git a/Lib/poplib.py b/Lib/poplib.py
index 0f12ae2..be98a7d 100644
--- a/Lib/poplib.py
+++ b/Lib/poplib.py
@@ -345,7 +345,7 @@ class POP3:
         >>>
 
         Really, according to RFC 2449, the cyrus folks should avoid
-        having the implementation splitted into multiple arguments...
+        having the implementation split into multiple arguments...
         """
         def _parsecap(line):
             lst = line.decode('ascii').split()
@@ -395,7 +395,7 @@ if HAVE_SSL:
 
                hostname - the hostname of the pop3 over ssl server
                port - port number
-               keyfile - PEM formatted file that countains your private key
+               keyfile - PEM formatted file that contains your private key
                certfile - PEM formatted certificate chain file
                context - a ssl.SSLContext
 
diff --git a/Lib/rlcompleter.py b/Lib/rlcompleter.py
index 7c7553e..94f9341 100644
--- a/Lib/rlcompleter.py
+++ b/Lib/rlcompleter.py
@@ -111,7 +111,7 @@ class Completer:
         """Compute matches when text contains a dot.
 
         Assuming the text is of the form NAME.NAME....[NAME], and is
-        evaluatable in self.namespace, it will be evaluated and its attributes
+        evaluable in self.namespace, it will be evaluated and its attributes
         (as revealed by dir()) are used as possible completions.  (For class
         instances, class members are also considered.)
 
diff --git a/Lib/shutil.py b/Lib/shutil.py
index 6879d8b..502bb67 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -56,7 +56,7 @@ class ReadError(OSError):
     """Raised when an archive cannot be read"""
 
 class RegistryError(Exception):
-    """Raised when a registery operation with the archiving
+    """Raised when a registry operation with the archiving
     and unpacking registeries fails"""
 
 
@@ -193,7 +193,7 @@ def copystat(src, dst, *, follow_symlinks=True):
         #   * follow_symlinks=False,
         #   * lchown() is unavailable, and
         #   * either
-        #       * fchownat() is unvailable or
+        #       * fchownat() is unavailable or
         #       * fchownat() doesn't implement AT_SYMLINK_NOFOLLOW.
         #         (it returned ENOSUP.)
         # therefore we're out of options--we simply cannot chown the
@@ -983,7 +983,7 @@ elif os.name == 'nt':
     def disk_usage(path):
         """Return disk usage statistics about the given path.
 
-        Returned valus is a named tuple with attributes 'total', 'used' and
+        Returned values is a named tuple with attributes 'total', 'used' and
         'free', which are the amount of total, used and free space, in bytes.
         """
         total, free = nt._getdiskusage(path)
diff --git a/Lib/ssl.py b/Lib/ssl.py
index 2c81a54..d17f8de 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -171,7 +171,7 @@ def _dnsname_to_pat(dn, max_wildcards=1):
     for frag in dn.split(r'.'):
         if frag.count('*') > max_wildcards:
             # Issue #17980: avoid denials of service by refusing more
-            # than one wildcard per fragment.  A survery of established
+            # than one wildcard per fragment.  A survey of established
             # policy among SSL implementations showed it to be a
             # reasonable choice.
             raise CertificateError(
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 3d77b26..6ebcc25 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -188,7 +188,7 @@ Exceptions raised in the child process, before the new program has
 started to execute, will be re-raised in the parent.  Additionally,
 the exception object will have one extra attribute called
 'child_traceback', which is a string containing traceback information
-from the childs point of view.
+from the child's point of view.
 
 The most common exception raised is OSError.  This occurs, for
 example, when trying to execute a non-existent file.  Applications
diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index 06df7df..7766e4a 100644
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -289,7 +289,7 @@ class ExtractError(TarError):
     """General exception for extract errors."""
     pass
 class ReadError(TarError):
-    """Exception for unreadble tar archives."""
+    """Exception for unreadable tar archives."""
     pass
 class CompressionError(TarError):
     """Exception for unavailable compression methods."""
diff --git a/Lib/tempfile.py b/Lib/tempfile.py
index 7df881b..df73289 100644
--- a/Lib/tempfile.py
+++ b/Lib/tempfile.py
@@ -636,7 +636,7 @@ class TemporaryDirectory(object):
         with TemporaryDirectory() as tmpdir:
             ...
 
-    Upon exiting the context, the directory and everthing contained
+    Upon exiting the context, the directory and everything contained
     in it are removed.
     """
 
diff --git a/Lib/threading.py b/Lib/threading.py
index 3526894..c7f919c 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -19,7 +19,7 @@ except ImportError:
 # Note regarding PEP 8 compliant names
 #  This threading model was originally inspired by Java, and inherited
 # the convention of camelCase function and method names from that
-# language. Those originaly names are not in any imminent danger of
+# language. Those original names are not in any imminent danger of
 # being deprecated (even for Py3k),so this module provides them as an
 # alias for the PEP 8 compliant names
 # Note that using the new PEP 8 compliant names facilitates substitution
diff --git a/Lib/turtle.py b/Lib/turtle.py
index 7edbb05..ab7b6ba 100644
--- a/Lib/turtle.py
+++ b/Lib/turtle.py
@@ -1278,7 +1278,7 @@ class TurtleScreen(TurtleScreenBase):
         self._delayvalue = int(delay)
 
     def _incrementudc(self):
-        """Increment upadate counter."""
+        """Increment update counter."""
         if not TurtleScreen._RUNNING:
             TurtleScreen._RUNNNING = True
             raise Terminator
@@ -2527,7 +2527,7 @@ class RawTurtle(TPen, TNavigator):
                 self.screen = TurtleScreen(canvas)
                 RawTurtle.screens.append(self.screen)
         else:
-            raise TurtleGraphicsError("bad cavas argument %s" % canvas)
+            raise TurtleGraphicsError("bad canvas argument %s" % canvas)
 
         screen = self.screen
         TNavigator.__init__(self, screen.mode())
@@ -2772,7 +2772,7 @@ class RawTurtle(TPen, TNavigator):
     def shapesize(self, stretch_wid=None, stretch_len=None, outline=None):
         """Set/return turtle's stretchfactors/outline. Set resizemode to "user".
 
-        Optinonal arguments:
+        Optional arguments:
            stretch_wid : positive number
            stretch_len : positive number
            outline  : positive number
@@ -3135,7 +3135,7 @@ class RawTurtle(TPen, TNavigator):
 
     def _goto(self, end):
         """Move the pen to the point end, thereby drawing a line
-        if pen is down. All other methodes for turtle movement depend
+        if pen is down. All other methods for turtle movement depend
         on this one.
         """
         ## Version with undo-stuff