diff options
author | Berker Peksag <berker.peksag@gmail.com> | 2014-10-19 15:07:05 (GMT) |
---|---|---|
committer | Berker Peksag <berker.peksag@gmail.com> | 2014-10-19 15:07:05 (GMT) |
commit | 1ed2e69a4ac1a4ac5a83ce3ab332b3051eaf59f0 (patch) | |
tree | 141b094c4dc7ce5297eb46e9ce881651abf9a71d | |
parent | 8c06ac5e5817fc7038c92115035107f9ff6c7a64 (diff) | |
parent | f23530f5690d2e37bba7235a6398b2c386a5b485 (diff) | |
download | cpython-1ed2e69a4ac1a4ac5a83ce3ab332b3051eaf59f0.zip cpython-1ed2e69a4ac1a4ac5a83ce3ab332b3051eaf59f0.tar.gz cpython-1ed2e69a4ac1a4ac5a83ce3ab332b3051eaf59f0.tar.bz2 |
Issue #22186: Fix typos in Lib/.
Patch by FĂ©vry Thibault.
-rw-r--r-- | Lib/heapq.py | 2 | ||||
-rw-r--r-- | Lib/idlelib/idle_test/htest.py | 2 | ||||
-rw-r--r-- | Lib/idlelib/idle_test/mock_tk.py | 2 | ||||
-rw-r--r-- | Lib/idlelib/idle_test/test_autoexpand.py | 2 | ||||
-rw-r--r-- | Lib/inspect.py | 2 | ||||
-rw-r--r-- | Lib/ipaddress.py | 2 | ||||
-rw-r--r-- | Lib/lib2to3/tests/test_parser.py | 2 | ||||
-rwxr-xr-x | Lib/pdb.py | 2 | ||||
-rw-r--r-- | Lib/poplib.py | 2 | ||||
-rw-r--r-- | Lib/socketserver.py | 2 | ||||
-rw-r--r-- | Lib/ssl.py | 2 | ||||
-rw-r--r-- | Lib/test/test_asyncio/test_base_events.py | 2 | ||||
-rw-r--r-- | Lib/unittest/test/test_case.py | 2 | ||||
-rwxr-xr-x | Tools/clinic/clinic.py | 6 |
14 files changed, 16 insertions, 16 deletions
diff --git a/Lib/heapq.py b/Lib/heapq.py index 258c0ba..07af37e 100644 --- a/Lib/heapq.py +++ b/Lib/heapq.py @@ -429,7 +429,7 @@ def merge(*iterables, key=None, reverse=False): # 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 index d673fe4..1fe5ad4 100644 --- a/Lib/idlelib/idle_test/htest.py +++ b/Lib/idlelib/idle_test/htest.py @@ -171,7 +171,7 @@ GetKeysDialog_spec = { "<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 index b9fd521..a8030f4 100644 --- a/Lib/idlelib/idle_test/mock_tk.py +++ b/Lib/idlelib/idle_test/mock_tk.py @@ -116,7 +116,7 @@ class Text: """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 index 7f112a0..7ca941e 100644 --- a/Lib/idlelib/idle_test/test_autoexpand.py +++ b/Lib/idlelib/idle_test/test_autoexpand.py @@ -78,7 +78,7 @@ class AutoExpandTest(unittest.TestCase): 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 index ae55347..83044b4 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -50,7 +50,7 @@ from collections import namedtuple, OrderedDict # 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 index bf2de2d..ced9e79 100644 --- a/Lib/ipaddress.py +++ b/Lib/ipaddress.py @@ -479,7 +479,7 @@ class _IPAddressBase(_TotalOrderingMixin): """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 index b64469c..5bb9d2b 100644 --- a/Lib/lib2to3/tests/test_parser.py +++ b/Lib/lib2to3/tests/test_parser.py @@ -90,7 +90,7 @@ class TestRaiseChanges(GrammarTest): 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""") @@ -301,7 +301,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): # 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 index 23a3517..2b0e3d5 100644 --- a/Lib/poplib.py +++ b/Lib/poplib.py @@ -41,7 +41,7 @@ LF = b'\n' 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 index f1b0e4a..fc4ee4e 100644 --- a/Lib/socketserver.py +++ b/Lib/socketserver.py @@ -288,7 +288,7 @@ class BaseServer: 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) @@ -202,7 +202,7 @@ def _dnsname_match(dn, hostname, max_wildcards=1): 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 index afc448c..d61a64c 100644 --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py @@ -371,7 +371,7 @@ class BaseEventLoopTests(test_utils.TestCase): 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 index f6f0dfe..a342595 100644 --- a/Lib/unittest/test/test_case.py +++ b/Lib/unittest/test/test_case.py @@ -1349,7 +1349,7 @@ test case 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 index 92edf6f..ee663e8 100755 --- a/Tools/clinic/clinic.py +++ b/Tools/clinic/clinic.py @@ -1015,7 +1015,7 @@ class CLanguage(Language): # 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 @@ class DSLParser: 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 @@ class DSLParser: # 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 |