Merge typo fixes from 3.5

This commit is contained in:
Martin Panter 2015-10-31 12:23:03 +00:00
commit ff99988397
7 changed files with 10 additions and 10 deletions

View file

@ -880,7 +880,7 @@ SSL sockets also have the following additional methods and attributes:
The :meth:`~SSLSocket.read` and :meth:`~SSLSocket.write` methods are the The :meth:`~SSLSocket.read` and :meth:`~SSLSocket.write` methods are the
low-level methods that read and write unencrypted, application-level data 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 require an active SSL connection, i.e. the handshake was completed and
:meth:`SSLSocket.unwrap` was not called. :meth:`SSLSocket.unwrap` was not called.

View file

@ -464,7 +464,7 @@ Snapshot
All inclusive filters are applied at once, a trace is ignored if no 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 inclusive filters match it. A trace is ignored if at least one exclusive
filter matchs it. filter matches it.
.. classmethod:: load(filename) .. classmethod:: load(filename)

View file

@ -2076,7 +2076,7 @@ using ``-Wd``).
Deprecations in the Python API 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 methods and functions are deprecated: :meth:`importlib.find_loader` is
replaced by :func:`importlib.util.find_spec`; replaced by :func:`importlib.util.find_spec`;
:meth:`importlib.machinery.PathFinder.find_module` is replaced by :meth:`importlib.machinery.PathFinder.find_module` is replaced by

View file

@ -860,7 +860,7 @@ The :class:`~collections.deque` class now defines
:meth:`~collections.deque.copy`, as well as supports ``+`` and ``*`` operators. :meth:`~collections.deque.copy`, as well as supports ``+`` and ``*`` operators.
This allows deques to be recognized as a :class:`~collections.abc.MutableSequence` This allows deques to be recognized as a :class:`~collections.abc.MutableSequence`
and improves their substitutability for lists. and improves their substitutability for lists.
(Contributed by Raymond Hettinger :issue:`23704`.) (Contributed by Raymond Hettinger in :issue:`23704`.)
Docstrings produced by :func:`~collections.namedtuple` can now be updated:: Docstrings produced by :func:`~collections.namedtuple` can now be updated::
@ -889,7 +889,7 @@ of :class:`tuple`, :class:`list`, etc.
A new :class:`~collections.abc.Generator` abstract base class. (Contributed A new :class:`~collections.abc.Generator` abstract base class. (Contributed
by Stefan Behnel in :issue:`24018`.) by Stefan Behnel in :issue:`24018`.)
New :class:`~collections.abc.Awaitable` :class:`~collections.abc.Coroutine`, New :class:`~collections.abc.Awaitable`, :class:`~collections.abc.Coroutine`,
:class:`~collections.abc.AsyncIterator`, and :class:`~collections.abc.AsyncIterator`, and
:class:`~collections.abc.AsyncIterable` abstract base classes. :class:`~collections.abc.AsyncIterable` abstract base classes.
(Contributed by Yury Selivanov in :issue:`24184`.) (Contributed by Yury Selivanov in :issue:`24184`.)
@ -1727,7 +1727,7 @@ the TLS handshake.
The new The new
:meth:`SSLSocket.selected_alpn_protocol() <ssl.SSLSocket.selected_alpn_protocol>` :meth:`SSLSocket.selected_alpn_protocol() <ssl.SSLSocket.selected_alpn_protocol>`
returns the protocol that was selected during the TLS handshake. returns the protocol that was selected during the TLS handshake.
:data:`~ssl.HAS_ALPN` flag indicates whether APLN support is present. :data:`~ssl.HAS_ALPN` flag indicates whether ALPN support is present.
Other Changes Other Changes
@ -1782,7 +1782,7 @@ subprocess
---------- ----------
The new :func:`~subprocess.run` function has been added. The new :func:`~subprocess.run` function has been added.
It runs the specified command and and returns a It runs the specified command and returns a
:class:`~subprocess.CompletedProcess` object, which describes a finished :class:`~subprocess.CompletedProcess` object, which describes a finished
process. The new API is more consistent and is the recommended approach process. The new API is more consistent and is the recommended approach
to invoking subprocesses in Python code that does not need to maintain to invoking subprocesses in Python code that does not need to maintain

View file

@ -224,7 +224,7 @@ name2codepoint = {
'spades': 0x2660, # black spade suit, U+2660 ISOpub 'spades': 0x2660, # black spade suit, U+2660 ISOpub
'sub': 0x2282, # subset of, U+2282 ISOtech 'sub': 0x2282, # subset of, U+2282 ISOtech
'sube': 0x2286, # subset of or equal to, U+2286 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 'sup': 0x2283, # superset of, U+2283 ISOtech
'sup1': 0x00b9, # superscript one = superscript digit one, U+00B9 ISOnum 'sup1': 0x00b9, # superscript one = superscript digit one, U+00B9 ISOnum
'sup2': 0x00b2, # superscript two = superscript digit two = squared, U+00B2 ISOnum 'sup2': 0x00b2, # superscript two = superscript digit two = squared, U+00B2 ISOnum

View file

@ -1968,7 +1968,7 @@ Core and Builtins
change also applies to bytes.splitlines and bytearray.splitlines. change also applies to bytes.splitlines and bytearray.splitlines.
- Issue #7732: Don't open a directory as a file anymore while importing a - 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. "__init__.py") and raise a ImportError instead.
- Issue #13021: Missing decref on an error path. Thanks to Suman Saha for - Issue #13021: Missing decref on an error path. Thanks to Suman Saha for

View file

@ -2857,7 +2857,7 @@ Library
- Issue #3015: _tkinter.create() now creates tkapp object with wantobject=1 by - Issue #3015: _tkinter.create() now creates tkapp object with wantobject=1 by
default. 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. it supports reverse() and negative indices. Original patch by Claudiu Popa.
- Issue #18807: If copying (no symlinks) specified for a venv, then the python - Issue #18807: If copying (no symlinks) specified for a venv, then the python