https://hg.python.org/cpython/rev/e51bb63d8f72 changeset: 98910:e51bb63d8f72 branch: 3.5 parent: 98907:d09923a9fdd0 parent: 98909:44464bbd339c user: Martin Panter <vadmium+py@gmail.com> date: Sat Oct 31 12:16:18 2015 +0000 summary: Merge spelling fixes from 3.4 into 3.5 files: Doc/library/ssl.rst | 2 +- Doc/library/tracemalloc.rst | 2 +- Doc/whatsnew/3.4.rst | 2 +- Lib/html/entities.py | 2 +- Misc/HISTORY | 2 +- Misc/NEWS | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -880,7 +880,7 @@ The :meth:`~SSLSocket.read` and :meth:`~SSLSocket.write` methods are the low-level methods that read and write unencrypted, application-level data - and and decrypt/encrypt it to encrypted, wire-level data. These methods + and decrypt/encrypt it to encrypted, wire-level data. These methods require an active SSL connection, i.e. the handshake was completed and :meth:`SSLSocket.unwrap` was not called. diff --git a/Doc/library/tracemalloc.rst b/Doc/library/tracemalloc.rst --- a/Doc/library/tracemalloc.rst +++ b/Doc/library/tracemalloc.rst @@ -464,7 +464,7 @@ All inclusive filters are applied at once, a trace is ignored if no inclusive filters match it. A trace is ignored if at least one exclusive - filter matchs it. + filter matches it. .. classmethod:: load(filename) diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -2076,7 +2076,7 @@ Deprecations in the Python API ------------------------------ -* As mentioned in :ref:`whatsnew-pep-451`, a number of :mod:`importilb` +* As mentioned in :ref:`whatsnew-pep-451`, a number of :mod:`importlib` methods and functions are deprecated: :meth:`importlib.find_loader` is replaced by :func:`importlib.util.find_spec`; :meth:`importlib.machinery.PathFinder.find_module` is replaced by diff --git a/Lib/html/entities.py b/Lib/html/entities.py --- a/Lib/html/entities.py +++ b/Lib/html/entities.py @@ -224,7 +224,7 @@ 'spades': 0x2660, # black spade suit, U+2660 ISOpub 'sub': 0x2282, # subset of, U+2282 ISOtech 'sube': 0x2286, # subset of or equal to, U+2286 ISOtech - 'sum': 0x2211, # n-ary sumation, U+2211 ISOamsb + 'sum': 0x2211, # n-ary summation, U+2211 ISOamsb 'sup': 0x2283, # superset of, U+2283 ISOtech 'sup1': 0x00b9, # superscript one = superscript digit one, U+00B9 ISOnum 'sup2': 0x00b2, # superscript two = superscript digit two = squared, U+00B2 ISOnum diff --git a/Misc/HISTORY b/Misc/HISTORY --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -1968,7 +1968,7 @@ change also applies to bytes.splitlines and bytearray.splitlines. - Issue #7732: Don't open a directory as a file anymore while importing a - module. Ignore the direcotry if its name matchs the module name (e.g. + module. Ignore the directory if its name matches the module name (e.g. "__init__.py") and raise a ImportError instead. - Issue #13021: Missing decref on an error path. Thanks to Suman Saha for diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -2692,7 +2692,7 @@ - Issue #3015: _tkinter.create() now creates tkapp object with wantobject=1 by default. -- Issue #10203: sqlite3.Row now truly supports sequence protocol. In particulr +- Issue #10203: sqlite3.Row now truly supports sequence protocol. In particular it supports reverse() and negative indices. Original patch by Claudiu Popa. - Issue #18807: If copying (no symlinks) specified for a venv, then the python -- Repository URL: https://hg.python.org/cpython