[Python-checkins] cpython (merge 3.4 -> default): Issue #22186: Fix typos in Lib/.
berker.peksag
python-checkins at python.org
Sun Oct 19 17:06:02 CEST 2014
https://hg.python.org/cpython/rev/57b19af3d71b
changeset: 93142:57b19af3d71b
parent: 93139:b532a0dab2cc
parent: 93141:98f16237e1e2
user: Berker Peksag <berker.peksag at gmail.com>
date: Sun Oct 19 18:07:05 2014 +0300
summary:
Issue #22186: Fix typos in Lib/.
Patch by Févry Thibault.
files:
Lib/heapq.py | 2 +-
Lib/idlelib/idle_test/htest.py | 2 +-
Lib/idlelib/idle_test/mock_tk.py | 2 +-
Lib/idlelib/idle_test/test_autoexpand.py | 2 +-
Lib/inspect.py | 2 +-
Lib/ipaddress.py | 2 +-
Lib/lib2to3/tests/test_parser.py | 2 +-
Lib/pdb.py | 2 +-
Lib/poplib.py | 2 +-
Lib/socketserver.py | 2 +-
Lib/ssl.py | 2 +-
Lib/test/test_asyncio/test_base_events.py | 2 +-
Lib/unittest/test/test_case.py | 2 +-
Tools/clinic/clinic.py | 6 +++---
14 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Lib/heapq.py b/Lib/heapq.py
--- a/Lib/heapq.py
+++ b/Lib/heapq.py
@@ -429,7 +429,7 @@
# value seen being in the 100 most extreme values is 100/101.
# * If the value is a new extreme value, the cost of inserting it into the
# heap is 1 + log(k, 2).
-# * The probabilty times the cost gives:
+# * The probability times the cost gives:
# (k/i) * (1 + log(k, 2))
# * Summing across the remaining n-k elements gives:
# sum((k/i) * (1 + log(k, 2)) for i in range(k+1, n+1))
diff --git a/Lib/idlelib/idle_test/htest.py b/Lib/idlelib/idle_test/htest.py
--- a/Lib/idlelib/idle_test/htest.py
+++ b/Lib/idlelib/idle_test/htest.py
@@ -171,7 +171,7 @@
"<nothing> is invalid.\n"
"No modifier key is invalid.\n"
"Shift key with [a-z],[0-9], function key, move key, tab, space"
- "is invalid.\nNo validitity checking if advanced key binding "
+ "is invalid.\nNo validity checking if advanced key binding "
"entry is used."
}
diff --git a/Lib/idlelib/idle_test/mock_tk.py b/Lib/idlelib/idle_test/mock_tk.py
--- a/Lib/idlelib/idle_test/mock_tk.py
+++ b/Lib/idlelib/idle_test/mock_tk.py
@@ -116,7 +116,7 @@
"""Return a (line, char) tuple of int indexes into self.data.
This implements .index without converting the result back to a string.
- The result is contrained by the number of lines and linelengths of
+ The result is constrained by the number of lines and linelengths of
self.data. For many indexes, the result is initially (1, 0).
The input index may have any of several possible forms:
diff --git a/Lib/idlelib/idle_test/test_autoexpand.py b/Lib/idlelib/idle_test/test_autoexpand.py
--- a/Lib/idlelib/idle_test/test_autoexpand.py
+++ b/Lib/idlelib/idle_test/test_autoexpand.py
@@ -78,7 +78,7 @@
equal(previous(), 'a')
def test_after_only(self):
- # Also add punctuation 'noise' that shoud be ignored.
+ # Also add punctuation 'noise' that should be ignored.
text = self.text
previous = self.auto_expand.getprevword
expand = self.auto_expand.expand_word_event
diff --git a/Lib/inspect.py b/Lib/inspect.py
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -50,7 +50,7 @@
# Create constants for the compiler flags in Include/code.h
# We try to get them from dis to avoid duplication, but fall
-# back to hardcoding so the dependency is optional
+# back to hard-coding so the dependency is optional
try:
from dis import COMPILER_FLAG_NAMES as _flag_names
except ImportError:
diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py
--- a/Lib/ipaddress.py
+++ b/Lib/ipaddress.py
@@ -479,7 +479,7 @@
"""Return prefix length from the bitwise netmask.
Args:
- ip_int: An integer, the netmask in axpanded bitwise format
+ ip_int: An integer, the netmask in expanded bitwise format
Returns:
An integer, the prefix length.
diff --git a/Lib/lib2to3/tests/test_parser.py b/Lib/lib2to3/tests/test_parser.py
--- a/Lib/lib2to3/tests/test_parser.py
+++ b/Lib/lib2to3/tests/test_parser.py
@@ -90,7 +90,7 @@
self.invalid_syntax("raise E from")
-# Adaptated from Python 3's Lib/test/test_grammar.py:GrammarTests.testFuncdef
+# Adapted from Python 3's Lib/test/test_grammar.py:GrammarTests.testFuncdef
class TestFunctionAnnotations(GrammarTest):
def test_1(self):
self.validate("""def f(x) -> list: pass""")
diff --git a/Lib/pdb.py b/Lib/pdb.py
--- a/Lib/pdb.py
+++ b/Lib/pdb.py
@@ -301,7 +301,7 @@
# An 'Internal StopIteration' exception is an exception debug event
# issued by the interpreter when handling a subgenerator run with
# 'yield from' or a generator controled by a for loop. No exception has
- # actually occured in this case. The debugger uses this debug event to
+ # actually occurred in this case. The debugger uses this debug event to
# stop when the debuggee is returning from such generators.
prefix = 'Internal ' if (not exc_traceback
and exc_type is StopIteration) else ''
diff --git a/Lib/poplib.py b/Lib/poplib.py
--- a/Lib/poplib.py
+++ b/Lib/poplib.py
@@ -41,7 +41,7 @@
CRLF = CR+LF
# maximal line length when calling readline(). This is to prevent
-# reading arbitrary lenght lines. RFC 1939 limits POP3 line length to
+# reading arbitrary length lines. RFC 1939 limits POP3 line length to
# 512 characters, including CRLF. We have selected 2048 just to be on
# the safe side.
_MAXLINE = 2048
diff --git a/Lib/socketserver.py b/Lib/socketserver.py
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -288,7 +288,7 @@
deadline = time() + timeout
# Wait until a request arrives or the timeout expires - the loop is
- # necessary to accomodate early wakeups due to EINTR.
+ # necessary to accommodate early wakeups due to EINTR.
with _ServerSelector() as selector:
selector.register(self, selectors.EVENT_READ)
diff --git a/Lib/ssl.py b/Lib/ssl.py
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -202,7 +202,7 @@
wildcards = leftmost.count('*')
if wildcards > max_wildcards:
# Issue #17980: avoid denials of service by refusing more
- # than one wildcard per fragment. A survery of established
+ # than one wildcard per fragment. A survey of established
# policy among SSL implementations showed it to be a
# reasonable choice.
raise CertificateError(
diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py
--- a/Lib/test/test_asyncio/test_base_events.py
+++ b/Lib/test/test_asyncio/test_base_events.py
@@ -371,7 +371,7 @@
self.loop.run_until_complete, self.loop.subprocess_exec,
asyncio.SubprocessProtocol)
- # exepected multiple arguments, not a list
+ # expected multiple arguments, not a list
self.assertRaises(TypeError,
self.loop.run_until_complete, self.loop.subprocess_exec,
asyncio.SubprocessProtocol, args)
diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py
--- a/Lib/unittest/test/test_case.py
+++ b/Lib/unittest/test/test_case.py
@@ -1349,7 +1349,7 @@
self.checkAssertLogsPerLevel('ERROR')
def checkAssertLogsPerLogger(self, logger):
- # Check per-logger fitering
+ # Check per-logger filtering
with self.assertNoStderr():
with self.assertLogs(level='DEBUG') as outer_cm:
with self.assertLogs(logger, level='DEBUG') as cm:
diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
--- a/Tools/clinic/clinic.py
+++ b/Tools/clinic/clinic.py
@@ -1015,7 +1015,7 @@
# when we're METH_O, but have a custom return converter,
# we use "impl_parameters" for the parsing function
# because that works better. but that means we must
- # supress actually declaring the impl's parameters
+ # suppress actually declaring the impl's parameters
# as variables in the parsing function. but since it's
# METH_O, we have exactly one anyway, so we know exactly
# where it is.
@@ -3734,7 +3734,7 @@
if self.keyword_only:
fail("Function " + self.function.name + " mixes keyword-only and positional-only parameters, which is unsupported.")
self.parameter_state = self.ps_seen_slash
- # fixup preceeding parameters
+ # fixup preceding parameters
for p in self.function.parameters.values():
if (p.kind != inspect.Parameter.POSITIONAL_OR_KEYWORD and not isinstance(p.converter, self_converter)):
fail("Function " + self.function.name + " mixes keyword-only and positional-only parameters, which is unsupported.")
@@ -3930,7 +3930,7 @@
# for __init__. (it can't be, __init__ doesn't
# have a docstring.) if this is an __init__
# (or __new__), then this signature is for
- # calling the class to contruct a new instance.
+ # calling the class to construct a new instance.
p_add('$')
name = p.converter.signature_name or p.name
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list