[Python-checkins] cpython (merge 3.5 -> default): Merge typo fixes from 3.5

Wed Oct 7 07:28:45 EDT 2015

https://hg.python.org/cpython/rev/2333efe17938
changeset: 98590:2333efe17938
parent: 98584:7067420c3e72
parent: 98589:e75e8aeb8ac7
user: Martin Panter <vadmium+py at gmail.com>
date: Wed Oct 07 11:13:55 2015 +0000
summary:
 Merge typo fixes from 3.5
files:
 Doc/library/collections.rst | 2 +-
 Doc/library/test.rst | 2 +-
 Lib/http/server.py | 2 +-
 Misc/HISTORY | 2 +-
 Misc/NEWS | 6 +++---
 Modules/_io/stringio.c | 2 +-
 Objects/methodobject.c | 2 +-
 Objects/object.c | 2 +-
 Objects/typeobject.c | 2 +-
 Python/ceval.c | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -1018,7 +1018,7 @@
 
 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>`
diff --git a/Doc/library/test.rst b/Doc/library/test.rst
--- a/Doc/library/test.rst
+++ b/Doc/library/test.rst
@@ -160,7 +160,7 @@
 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
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -831,7 +831,7 @@
 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
--- a/Misc/HISTORY
+++ b/Misc/HISTORY
@@ -6751,7 +6751,7 @@
 
 - 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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -421,7 +421,7 @@
 -----
 
 - 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 @@
 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 @@
 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
--- a/Modules/_io/stringio.c
+++ b/Modules/_io/stringio.c
@@ -750,7 +750,7 @@
 /* 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/methodobject.c b/Objects/methodobject.c
--- a/Objects/methodobject.c
+++ b/Objects/methodobject.c
@@ -89,7 +89,7 @@
 
 /* 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);
diff --git a/Objects/object.c b/Objects/object.c
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -475,7 +475,7 @@
 #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
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -901,7 +901,7 @@
 #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/Python/ceval.c b/Python/ceval.c
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1214,7 +1214,7 @@
 #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
 
-- 
Repository URL: https://hg.python.org/cpython
