From f23530f5690d2e37bba7235a6398b2c386a5b485 Mon Sep 17 00:00:00 2001 From: Berker Peksag Date: Sun, 19 Oct 2014 18:04:38 +0300 Subject: [PATCH] Issue #22186: Fix typos in Lib/. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch by Févry Thibault. --- 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/ssl.py | 2 +- Lib/test/test_asyncio/test_base_events.py | 2 +- Lib/unittest/test/test_case.py | 2 +- Tools/clinic/clinic.py | 6 +++--- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Lib/idlelib/idle_test/htest.py b/Lib/idlelib/idle_test/htest.py index d673fe4ea82..1fe5ad4a516 100644 --- a/Lib/idlelib/idle_test/htest.py +++ b/Lib/idlelib/idle_test/htest.py @@ -171,7 +171,7 @@ GetKeysDialog_spec = { " 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 b9fd5216b93..a8030f4f5ca 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 7f112a0025d..7ca941ec290 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 f6e1b4789f1..530f2402b8b 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -49,7 +49,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 54df39ae562..ebc04bb1458 100644 --- a/Lib/ipaddress.py +++ b/Lib/ipaddress.py @@ -472,7 +472,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 b64469ced6e..5bb9d2becb7 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""") diff --git a/Lib/pdb.py b/Lib/pdb.py index 42e605e682a..e28564bdfa3 100755 --- a/Lib/pdb.py +++ b/Lib/pdb.py @@ -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 23a3517e983..2b0e3d54156 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/ssl.py b/Lib/ssl.py index d9d191628cd..e2636eff4c9 100644 --- a/Lib/ssl.py +++ b/Lib/ssl.py @@ -213,7 +213,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 afc448c0da8..d61a64c9a38 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 e70dd5bd03b..f0b327dd826 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 93e8f5a6b9a..65bad5174cc 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. @@ -3727,7 +3727,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.") @@ -3923,7 +3923,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