https://hg.python.org/cpython/rev/169551a8d5d1 changeset: 101560:169551a8d5d1 parent: 101556:c95864a37ee2 parent: 101559:f7c85accbde9 user: Martin Panter <vadmium+py@gmail.com> date: Sun May 29 09:05:06 2016 +0000 summary: Issue #27125: Merge typo fixes from 3.5 Also merge changes from Issue #27117; no actual code changes to 3.6. files: Doc/library/collections.rst | 2 +- Doc/library/multiprocessing.rst | 2 +- Doc/library/os.rst | 2 +- Doc/library/shlex.rst | 3 ++- Doc/library/typing.rst | 2 +- Doc/whatsnew/2.6.rst | 2 +- Lib/collections/__init__.py | 3 ++- Lib/email/message.py | 2 +- Lib/test/test_httplib.py | 4 ++-- Lib/tkinter/tix.py | 2 +- Misc/HISTORY | 4 ++-- Objects/object.c | 2 +- README | 2 +- 13 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -56,7 +56,7 @@ dictionary is provided so that a new chain always has at least one mapping. The underlying mappings are stored in a list. That list is public and can - accessed or updated using the *maps* attribute. There is no other state. + be accessed or updated using the *maps* attribute. There is no other state. Lookups search the underlying mappings successively until a key is found. In contrast, writes, updates, and deletions only operate on the first mapping. diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -2484,7 +2484,7 @@ If authentication is requested but no authentication key is specified then the return value of ``current_process().authkey`` is used (see -:class:`~multiprocessing.Process`). This value will automatically inherited by +:class:`~multiprocessing.Process`). This value will be automatically inherited by any :class:`~multiprocessing.Process` object that the current process creates. This means that (by default) all processes of a multi-process program will share a single authentication key which can be used when setting up connections diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -3507,7 +3507,7 @@ .. data:: SCHED_RESET_ON_FORK - This flag can OR'ed with any other scheduling policy. When a process with + This flag can be OR'ed with any other scheduling policy. When a process with this flag set forks, its child's scheduling policy and priority are reset to the default. diff --git a/Doc/library/shlex.rst b/Doc/library/shlex.rst --- a/Doc/library/shlex.rst +++ b/Doc/library/shlex.rst @@ -244,7 +244,8 @@ This attribute is ``None`` by default. If you assign a string to it, that string will be recognized as a lexical-level inclusion request similar to the ``source`` keyword in various shells. That is, the immediately following token - will opened as a filename and input taken from that stream until EOF, at which + will be opened as a filename and input will + be taken from that stream until EOF, at which point the :meth:`~io.IOBase.close` method of that stream will be called and the input source will again become the original input stream. Source requests may be stacked any number of levels deep. diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst --- a/Doc/library/typing.rst +++ b/Doc/library/typing.rst @@ -156,7 +156,7 @@ class LinkedList(Sized, Generic[T]): ... -When inheriting from generic classes, some type variables could fixed:: +When inheriting from generic classes, some type variables could be fixed:: from typing import TypeVar, Mapping diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst --- a/Doc/whatsnew/2.6.rst +++ b/Doc/whatsnew/2.6.rst @@ -3154,7 +3154,7 @@ :func:`macostools.touched` function to be removed because it depended on the :mod:`macfs` module. (:issue:`1490190`) -* Many other Mac OS modules have been deprecated and will removed in +* Many other Mac OS modules have been deprecated and will be removed in Python 3.0: :mod:`_builtinSuites`, :mod:`aepack`, diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -850,7 +850,8 @@ to create a single, updateable view. The underlying mappings are stored in a list. That list is public and can - accessed or updated using the *maps* attribute. There is no other state. + be accessed or updated using the *maps* attribute. There is no other + state. Lookups search the underlying mappings successively until a key is found. In contrast, writes, updates, and deletions only operate on the first diff --git a/Lib/email/message.py b/Lib/email/message.py --- a/Lib/email/message.py +++ b/Lib/email/message.py @@ -710,7 +710,7 @@ message, it will be set to "text/plain" and the new parameter and value will be appended as per RFC 2045. - An alternate header can specified in the header argument, and all + An alternate header can be specified in the header argument, and all parameters will be quoted as necessary unless requote is False. If charset is specified, the parameter will be encoded according to RFC diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py --- a/Lib/test/test_httplib.py +++ b/Lib/test/test_httplib.py @@ -255,8 +255,8 @@ self.assertIn(b'\xa0NonbreakSpace: value', conn._buffer) def test_ipv6host_header(self): - # Default host header on IPv6 transaction should wrapped by [] if - # its actual IPv6 address + # Default host header on IPv6 transaction should be wrapped by [] if + # it is an IPv6 address expected = b'GET /foo HTTP/1.1\r\nHost: [2001::]:81\r\n' \ b'Accept-Encoding: identity\r\n\r\n' conn = client.HTTPConnection('[2001::]:81') diff --git a/Lib/tkinter/tix.py b/Lib/tkinter/tix.py --- a/Lib/tkinter/tix.py +++ b/Lib/tkinter/tix.py @@ -1048,7 +1048,7 @@ class LabelEntry(TixWidget): """LabelEntry - Entry field with label. Packages an entry widget - and a label into one mega widget. It can beused be used to simplify + and a label into one mega widget. It can be used be used to simplify the creation of ``entry-form'' type of interface. Subwidgets Class diff --git a/Misc/HISTORY b/Misc/HISTORY --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -6633,7 +6633,7 @@ PyErr_Format, on machines with HAVE_LONG_LONG defined. - Issue #6151: Made PyDescr_COMMON conform to standard C (like PyObject_HEAD in - PEP 3123). The PyDescr_TYPE and PyDescr_NAME macros should be should used for + PEP 3123). The PyDescr_TYPE and PyDescr_NAME macros should be used for accessing the d_type and d_name members of structures using PyDescr_COMMON. - Issue #6405: Remove duplicate type declarations in descrobject.h. @@ -16065,7 +16065,7 @@ - All standard iterators now ensure that, once StopIteration has been raised, all future calls to next() on the same iterator will also raise StopIteration. There used to be various counterexamples to - this behavior, which could caused confusion or subtle program + this behavior, which could have caused confusion or subtle program breakage, without any benefits. (Note that this is still an iterator's responsibility; the iterator framework does not enforce this.) diff --git a/Objects/object.c b/Objects/object.c --- a/Objects/object.c +++ b/Objects/object.c @@ -1853,7 +1853,7 @@ /* These methods are used to control infinite recursion in repr, str, print, etc. Container objects that may recursively contain themselves, - e.g. builtin dictionaries and lists, should used Py_ReprEnter() and + e.g. builtin dictionaries and lists, should use Py_ReprEnter() and Py_ReprLeave() to avoid infinite recursion. Py_ReprEnter() returns 0 the first time it is called for a particular diff --git a/README b/README --- a/README +++ b/README @@ -58,7 +58,7 @@ If ran, the "profile-opt" rule will do several steps. First, the entire Python directory is cleaned of temporary files that -may resulted in a previous compilation. +may have resulted in a previous compilation. Then, an instrumented version of the interpreter is built, using suitable compiler flags for each flavour. Note that this is just an intermediary -- Repository URL: https://hg.python.org/cpython