Merge typo fixes from 3.5

Doc/library/collections.rst

@@ -1018,7 +1018,7 @@ anywhere a regular dictionary is used.
 
 The :class:`OrderedDict` constructor and :meth:`update` method both accept
 keyword arguments, but their order is lost because Python's function call
-semantics pass-in keyword arguments using a regular unordered dictionary.
+semantics pass in keyword arguments using a regular unordered dictionary.
 
 .. versionchanged:: 3.5
    The items, keys, and values :term:`views <dictionary view>`

Doc/library/test.rst

@@ -160,7 +160,7 @@ Running tests using the command-line interface
 The :mod:`test` package can be run as a script to drive Python's regression
 test suite, thanks to the :option:`-m` option: :program:`python -m test`. Under
 the hood, it uses :mod:`test.regrtest`; the call :program:`python -m
-test.regrtest` used in previous Python versions still works).  Running the
+test.regrtest` used in previous Python versions still works.  Running the
 script by itself automatically starts running all regression tests in the
 :mod:`test` package. It does this by finding all modules in the package whose
 name starts with ``test_``, importing them, and executing the function

Lib/http/server.py

@@ -831,7 +831,7 @@ class SimpleHTTPRequestHandler(BaseHTTPRequestHandler):
 def _url_collapse_path(path):
     """
     Given a URL path, remove extra '/'s and '.' path elements and collapse
-    any '..' references and returns a colllapsed path.
+    any '..' references and returns a collapsed path.
 
     Implements something akin to RFC-2396 5.2 step 6 to parse relative paths.
     The utility of this function is limited to is_cgi method and helps

Misc/HISTORY

@@ -6751,7 +6751,7 @@ Library
 
 - Issue #7895: platform.mac_ver() no longer crashes after calling os.fork().
 
-- Issue #9323: Fixed a bug in trace.py that resulted in loosing the name of the
+- Issue #9323: Fixed a bug in trace.py that resulted in losing the name of the
   script being traced.  Patch by Eli Bendersky.
 
 - Issue #9282: Fixed --listfuncs option of trace.py.  Thanks Eli Bendersky for

Misc/NEWS

@@ -421,7 +421,7 @@ Build
 -----
 
 - Issue #24915: Add LLVM support for PGO builds and use the test suite to
-  generate the profile data. Initiial patch by Alecsandru Patrascu of Intel.
+  generate the profile data. Initial patch by Alecsandru Patrascu of Intel.
 
 - Issue #24910: Windows MSIs now have unique display names.
 
@@ -1830,7 +1830,7 @@ Core and Builtins
   type) can now be weakref'ed.  Patch by Wei Wu.
 
 - Issue #22077: Improve index error messages for bytearrays, bytes, lists,
-  and tuples by adding 'or slices'. Added ', not <typename' for bytearrays.
+  and tuples by adding 'or slices'. Added ', not <typename>' for bytearrays.
   Original patch by Claudiu Popa.
 
 - Issue #20179: Apply Argument Clinic to bytes and bytearray.
@@ -1854,7 +1854,7 @@ Core and Builtins
   engine friendly) error messages when "exec" and "print" are used as
   statements.
 
-- Issue #21642: If the conditional if-else expression, allow an integer written
+- Issue #21642: In the conditional if-else expression, allow an integer written
   with no space between itself and the ``else`` keyword (e.g. ``True if 42else
   False``) to be valid syntax.
 

Modules/_io/stringio.c

@@ -750,7 +750,7 @@ _io_StringIO___init___impl(stringio *self, PyObject *value,
     /* If newline == "", we don't translate anything.
        If newline == "\n" or newline == None, we translate to "\n", which is
        a no-op.
-       (for newline == None, TextIOWrapper translates to os.sepline, but it
+       (for newline == None, TextIOWrapper translates to os.linesep, but it
        is pointless for StringIO)
     */
     if (newline != NULL && newline[0] == '\r') {

Objects/methodobject.c

@@ -89,7 +89,7 @@ PyCFunction_Call(PyObject *func, PyObject *args, PyObject *kwds)
 
     /* PyCFunction_Call() must not be called with an exception set,
        because it may clear it (directly or indirectly) and so the
-       caller looses its exception */
+       caller loses its exception */
     assert(!PyErr_Occurred());
 
     flags = PyCFunction_GET_FLAGS(func) & ~(METH_CLASS | METH_STATIC | METH_COEXIST);

Objects/object.c

@@ -475,7 +475,7 @@ PyObject_Repr(PyObject *v)
 #ifdef Py_DEBUG
     /* PyObject_Repr() must not be called with an exception set,
        because it may clear it (directly or indirectly) and so the
-       caller looses its exception */
+       caller loses its exception */
     assert(!PyErr_Occurred());
 #endif
 

Objects/typeobject.c

@@ -901,7 +901,7 @@ type_call(PyTypeObject *type, PyObject *args, PyObject *kwds)
 #ifdef Py_DEBUG
     /* type_call() must not be called with an exception set,
        because it may clear it (directly or indirectly) and so the
-       caller looses its exception */
+       caller loses its exception */
     assert(!PyErr_Occurred());
 #endif
 

Python/ceval.c

@@ -1214,7 +1214,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
 #ifdef Py_DEBUG
     /* PyEval_EvalFrameEx() must not be called with an exception set,
        because it may clear it (directly or indirectly) and so the
-       caller looses its exception */
+       caller loses its exception */
     assert(!PyErr_Occurred());
 #endif