Skip to content

Commit 4827e48

Browse files
committed
Merge spelling fixes from 3.4 into 3.5
2 parents c029481 + 1f1177d commit 4827e48

6 files changed

Lines changed: 6 additions & 6 deletions

File tree

Doc/library/ssl.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@ SSL sockets also have the following additional methods and attributes:
880880

881881
The :meth:`~SSLSocket.read` and :meth:`~SSLSocket.write` methods are the
882882
low-level methods that read and write unencrypted, application-level data
883-
and and decrypt/encrypt it to encrypted, wire-level data. These methods
883+
and decrypt/encrypt it to encrypted, wire-level data. These methods
884884
require an active SSL connection, i.e. the handshake was completed and
885885
:meth:`SSLSocket.unwrap` was not called.
886886

Doc/library/tracemalloc.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ Snapshot
464464

465465
All inclusive filters are applied at once, a trace is ignored if no
466466
inclusive filters match it. A trace is ignored if at least one exclusive
467-
filter matchs it.
467+
filter matches it.
468468

469469

470470
.. classmethod:: load(filename)

Doc/whatsnew/3.4.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2076,7 +2076,7 @@ using ``-Wd``).
20762076
Deprecations in the Python API
20772077
------------------------------
20782078

2079-
* As mentioned in :ref:`whatsnew-pep-451`, a number of :mod:`importilb`
2079+
* As mentioned in :ref:`whatsnew-pep-451`, a number of :mod:`importlib`
20802080
methods and functions are deprecated: :meth:`importlib.find_loader` is
20812081
replaced by :func:`importlib.util.find_spec`;
20822082
:meth:`importlib.machinery.PathFinder.find_module` is replaced by

Lib/html/entities.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
'spades': 0x2660, # black spade suit, U+2660 ISOpub
225225
'sub': 0x2282, # subset of, U+2282 ISOtech
226226
'sube': 0x2286, # subset of or equal to, U+2286 ISOtech
227-
'sum': 0x2211, # n-ary sumation, U+2211 ISOamsb
227+
'sum': 0x2211, # n-ary summation, U+2211 ISOamsb
228228
'sup': 0x2283, # superset of, U+2283 ISOtech
229229
'sup1': 0x00b9, # superscript one = superscript digit one, U+00B9 ISOnum
230230
'sup2': 0x00b2, # superscript two = superscript digit two = squared, U+00B2 ISOnum

Misc/HISTORY

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1968,7 +1968,7 @@ Core and Builtins
19681968
change also applies to bytes.splitlines and bytearray.splitlines.
19691969

19701970
- Issue #7732: Don't open a directory as a file anymore while importing a
1971-
module. Ignore the direcotry if its name matchs the module name (e.g.
1971+
module. Ignore the directory if its name matches the module name (e.g.
19721972
"__init__.py") and raise a ImportError instead.
19731973

19741974
- Issue #13021: Missing decref on an error path. Thanks to Suman Saha for

Misc/NEWS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2692,7 +2692,7 @@ Library
26922692
- Issue #3015: _tkinter.create() now creates tkapp object with wantobject=1 by
26932693
default.
26942694

2695-
- Issue #10203: sqlite3.Row now truly supports sequence protocol. In particulr
2695+
- Issue #10203: sqlite3.Row now truly supports sequence protocol. In particular
26962696
it supports reverse() and negative indices. Original patch by Claudiu Popa.
26972697

26982698
- Issue #18807: If copying (no symlinks) specified for a venv, then the python

0 commit comments

Comments
 (0)