mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Merge spelling fixes from 3.4 into 3.5

Browse source
This commit is contained in:
Martin Panter 2015-10-31 12:16:18 +00:00
commit 4827e488a4
6 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/library/ssl.rst
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.

2
Doc/library/tracemalloc.rst
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)

2
Doc/whatsnew/3.4.rst
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

2
Lib/html/entities.py
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

2
Misc/HISTORY
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

2
Misc/NEWS
View file

@ -2692,7 +2692,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