Various minor typos in documentation and comments

diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index 347cf1fca5c5890d3fad746f50de9d138a530bd8..09718254eb745e7126a70a007d46503c2325d17b 100644 (file)
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -980,7 +980,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.
 
 
 :class:`OrderedDict` Examples and Recipes

diff --git a/Doc/library/test.rst b/Doc/library/test.rst
index 974909e18204fdf75ace00cff1256edc77444e10..2fdaf8cb371f2b9c04860ef5494d5d996301acda 100644 (file)
--- a/Doc/library/test.rst
+++ b/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

diff --git a/Lib/http/server.py b/Lib/http/server.py
index a97aa312dc962e98105683f31f65c253a3a0ea6f..4688096b31c47b47c63a7c48920c4c32f556d23b 100644 (file)
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -881,7 +881,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

diff --git a/Misc/HISTORY b/Misc/HISTORY
index f48375931ab20709f56924e0acad24b60a5e5d43..595795682d2c9f53152d728a69be5ebadafaa077 100644 (file)
--- a/Misc/HISTORY
+++ b/Misc/HISTORY
@@ -6718,7 +6718,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

diff --git a/Misc/NEWS b/Misc/NEWS
index f393d68544a3e2d1f7a5b1762ed324a3bbc351a5..ba7e54d21f1cbac73c7914811972e78f2c213a78 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1131,7 +1131,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.
 

diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c
index 9d73884f731758d21f2531224d5ed852dd298671..95fb703eb0fe91d7dccfa86d0fa70cc817bf672e 100644 (file)
--- a/Modules/_io/stringio.c
+++ b/Modules/_io/stringio.c
@@ -711,7 +711,7 @@ stringio_init(stringio *self, PyObject *args, PyObject *kwds)
     /* 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') {

diff --git a/Objects/object.c b/Objects/object.c
index a1a69fa123e68468be49d06a1999cfea190899eb..307e3ac321592e737bfe244e2d1d8dbe7aa66894 100644 (file)
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -459,7 +459,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
 

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index cf4e4e57dac526e8f7692ca45691c7311427e670..09c895c8c9d404758d97d3fc56d394d6969715d7 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -876,7 +876,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
 

diff --git a/PC/VS9.0/kill_python.c b/PC/VS9.0/kill_python.c
index 604731f3f81c7764d441b1cc092865774fe3f3fe..666e1b0297c5ae5af93092a1af63af84098712ec 100644 (file)
--- a/PC/VS9.0/kill_python.c
+++ b/PC/VS9.0/kill_python.c
@@ -108,7 +108,7 @@ main(int argc, char **argv)
          * modules for all processes (not just the python[_d].exe ones)
          * and see if any of our DLLs are loaded (i.e. python34[_d].dll),
          * as that would also inhibit our ability to rebuild the solution.
-         * Not worth loosing sleep over though; for now, a simple check 
+         * Not worth losing sleep over though; for now, a simple check
          * for just the python executable should be sufficient.
          */
 

diff --git a/PCbuild/kill_python.c b/PCbuild/kill_python.c
index 604731f3f81c7764d441b1cc092865774fe3f3fe..666e1b0297c5ae5af93092a1af63af84098712ec 100644 (file)
--- a/PCbuild/kill_python.c
+++ b/PCbuild/kill_python.c
@@ -108,7 +108,7 @@ main(int argc, char **argv)
          * modules for all processes (not just the python[_d].exe ones)
          * and see if any of our DLLs are loaded (i.e. python34[_d].dll),
          * as that would also inhibit our ability to rebuild the solution.
-         * Not worth loosing sleep over though; for now, a simple check 
+         * Not worth losing sleep over though; for now, a simple check
          * for just the python executable should be sufficient.
          */
 

diff --git a/Python/ceval.c b/Python/ceval.c
index 275229858e220a3412d2b42fdad01bef13e4f614..7a0cb7f04abdc301fc0afbf1924331df73705c1f 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1212,7 +1212,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
 
@@ -4087,7 +4087,7 @@ PyEval_CallObjectWithKeywords(PyObject *func, PyObject *arg, PyObject *kw)
 #ifdef Py_DEBUG
     /* PyEval_CallObjectWithKeywords() must not be called with an exception
        set, because it may clear it (directly or indirectly)
-       and so the caller looses its exception */
+       and so the caller loses its exception */
     assert(!PyErr_Occurred());
 #endif