[Python-checkins] bpo-32297: Few misspellings found in Python source code comments. (#4803)
Andrew Svetlov
webhook-mailer at python.org
Thu Dec 14 06:04:56 EST 2017
https://github.com/python/cpython/commit/53f7a7c2814fbfd8a29200926601a32fa48bacb3
commit: 53f7a7c2814fbfd8a29200926601a32fa48bacb3
branch: master
author: Mike <mehanig at gmail.com>
committer: Andrew Svetlov <andrew.svetlov at gmail.com>
date: 2017-12-14T13:04:53+02:00
summary:
bpo-32297: Few misspellings found in Python source code comments. (#4803)
* Fix multiple typos in code comments
* Add spacing in comments (test_logging.py, test_math.py)
* Fix spaces at the beginning of comments in test_logging.py
files:
M Doc/includes/email-read-alternative.py
M Lib/ctypes/test/test_pep3118.py
M Lib/ctypes/test/test_structures.py
M Lib/email/quoprimime.py
M Lib/http/client.py
M Lib/os.py
M Lib/tarfile.py
M Lib/test/_test_multiprocessing.py
M Lib/test/test_baseexception.py
M Lib/test/test_class.py
M Lib/test/test_collections.py
M Lib/test/test_dataclasses.py
M Lib/test/test_functools.py
M Lib/test/test_generators.py
M Lib/test/test_importlib/builtin/test_finder.py
M Lib/test/test_importlib/source/test_file_loader.py
M Lib/test/test_inspect.py
M Lib/test/test_io.py
M Lib/test/test_largefile.py
M Lib/test/test_logging.py
M Lib/test/test_math.py
M Lib/test/test_parser.py
M Lib/test/test_random.py
M Lib/test/test_site.py
M Lib/test/test_socket.py
M Lib/test/test_ssl.py
M Lib/test/test_sys_settrace.py
M Lib/test/test_xml_etree.py
M Lib/test/test_zipapp.py
M Lib/tkinter/test/test_ttk/test_functions.py
M Lib/tkinter/ttk.py
M Lib/turtledemo/__main__.py
M Lib/unittest/test/testmock/testmagicmethods.py
M Lib/xml/etree/ElementTree.py
M Lib/xmlrpc/client.py
M Mac/BuildScript/build-installer.py
M Modules/faulthandler.c
M Tools/c-globals/check-c-globals.py
M setup.py
diff --git a/Doc/includes/email-read-alternative.py b/Doc/includes/email-read-alternative.py
index 3f5ab24c0fb..5ea84e62584 100644
--- a/Doc/includes/email-read-alternative.py
+++ b/Doc/includes/email-read-alternative.py
@@ -21,7 +21,7 @@
print('From:', msg['from'])
print('Subject:', msg['subject'])
-# If we want to print a priview of the message content, we can extract whatever
+# If we want to print a preview of the message content, we can extract whatever
# the least formatted payload is and print the first three lines. Of course,
# if the message has no plain text part printing the first three lines of html
# is probably useless, but this is just a conceptual example.
diff --git a/Lib/ctypes/test/test_pep3118.py b/Lib/ctypes/test/test_pep3118.py
index f3c0e23e53e..81e8ca7638f 100644
--- a/Lib/ctypes/test/test_pep3118.py
+++ b/Lib/ctypes/test/test_pep3118.py
@@ -188,7 +188,7 @@ class Complete(Structure):
(PackedPoint, "B", (), PackedPoint),
(Point2, "T{<l:x:<l:y:}".replace('l', s_long), (), Point2),
(EmptyStruct, "T{}", (), EmptyStruct),
- # the pep does't support unions
+ # the pep doesn't support unions
(aUnion, "B", (), aUnion),
# structure with sub-arrays
(StructWithArrays, "T{(2,3)<l:x:(4)T{<l:x:<l:y:}:y:}".replace('l', s_long), (), StructWithArrays),
diff --git a/Lib/ctypes/test/test_structures.py b/Lib/ctypes/test/test_structures.py
index d90c71144c9..d1ea43bc7e3 100644
--- a/Lib/ctypes/test/test_structures.py
+++ b/Lib/ctypes/test/test_structures.py
@@ -129,7 +129,7 @@ class XX(Structure):
self.assertEqual(sizeof(XX), 0)
def test_fields(self):
- # test the offset and size attributes of Structure/Unoin fields.
+ # test the offset and size attributes of Structure/Union fields.
class X(Structure):
_fields_ = [("x", c_int),
("y", c_char)]
diff --git a/Lib/email/quoprimime.py b/Lib/email/quoprimime.py
index c543eb59ae7..94534f7ee1e 100644
--- a/Lib/email/quoprimime.py
+++ b/Lib/email/quoprimime.py
@@ -173,7 +173,7 @@ def body_encode(body, maxlinelen=76, eol=NL):
if not body:
return body
- # quote speacial characters
+ # quote special characters
body = body.translate(_QUOPRI_BODY_ENCODE_MAP)
soft_break = '=' + eol
diff --git a/Lib/http/client.py b/Lib/http/client.py
index 70eadaed14e..1a852cd76e4 100644
--- a/Lib/http/client.py
+++ b/Lib/http/client.py
@@ -538,7 +538,7 @@ def _get_chunk_left(self):
chunk_left = self.chunk_left
if not chunk_left: # Can be 0 or None
if chunk_left is not None:
- # We are at the end of chunk. dicard chunk end
+ # We are at the end of chunk, discard chunk end
self._safe_read(2) # toss the CRLF at the end of the chunk
try:
chunk_left = self._read_next_chunk_size()
diff --git a/Lib/os.py b/Lib/os.py
index 4f9fdf5b0ea..499e6285618 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -891,7 +891,7 @@ def spawnve(mode, file, args, env):
otherwise return -SIG, where SIG is the signal that killed it. """
return _spawnvef(mode, file, args, env, execve)
- # Note: spawnvp[e] is't currently supported on Windows
+ # Note: spawnvp[e] isn't currently supported on Windows
def spawnvp(mode, file, args):
"""spawnvp(mode, file, args) -> integer
diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index efc1f3b9f7f..0b8d31f85cf 100755
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -1058,7 +1058,7 @@ def frombuf(cls, buf, encoding, errors):
# The old GNU sparse format occupies some of the unused
# space in the buffer for up to 4 sparse structures.
- # Save the them for later processing in _proc_sparse().
+ # Save them for later processing in _proc_sparse().
if obj.type == GNUTYPE_SPARSE:
pos = 386
structs = []
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index dbca2d89ed1..60385536992 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -4115,7 +4115,7 @@ def test_noforkbomb(self):
#
class TestForkAwareThreadLock(unittest.TestCase):
- # We recurisvely start processes. Issue #17555 meant that the
+ # We recursively start processes. Issue #17555 meant that the
# after fork registry would get duplicate entries for the same
# lock. The size of the registry at generation n was ~2**n.
diff --git a/Lib/test/test_baseexception.py b/Lib/test/test_baseexception.py
index c055ee3d83c..c32468269a7 100644
--- a/Lib/test/test_baseexception.py
+++ b/Lib/test/test_baseexception.py
@@ -163,7 +163,7 @@ def test_raise_string(self):
self.raise_fails("spam")
def test_catch_non_BaseException(self):
- # Tryinng to catch an object that does not inherit from BaseException
+ # Trying to catch an object that does not inherit from BaseException
# is not allowed.
class NonBaseException(object):
pass
diff --git a/Lib/test/test_class.py b/Lib/test/test_class.py
index a916e878b7a..841cac9171c 100644
--- a/Lib/test/test_class.py
+++ b/Lib/test/test_class.py
@@ -617,7 +617,7 @@ class C:
with self.assertRaisesRegex(TypeError, r'C\(\).__init__\(\) takes no arguments'):
object.__init__(C(), 42)
- # Class with both `__init__` & `__new__` method overriden
+ # Class with both `__init__` & `__new__` method overridden
class D:
def __new__(cls, *args, **kwargs):
super().__new__(cls, *args, **kwargs)
diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py
index 7e106affbe0..6c466f41e68 100644
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -558,7 +558,7 @@ def __await__(self):
c = new_coro()
self.assertIsInstance(c, Awaitable)
- c.close() # awoid RuntimeWarning that coro() was not awaited
+ c.close() # avoid RuntimeWarning that coro() was not awaited
class CoroLike: pass
Coroutine.register(CoroLike)
@@ -608,7 +608,7 @@ def __await__(self):
c = new_coro()
self.assertIsInstance(c, Coroutine)
- c.close() # awoid RuntimeWarning that coro() was not awaited
+ c.close() # avoid RuntimeWarning that coro() was not awaited
class CoroLike:
def send(self, value):
@@ -1615,7 +1615,7 @@ def test_MutableSequence(self):
'__len__', '__getitem__', '__setitem__', '__delitem__', 'insert')
def test_MutableSequence_mixins(self):
- # Test the mixins of MutableSequence by creating a miminal concrete
+ # Test the mixins of MutableSequence by creating a minimal concrete
# class inherited from it.
class MutableSequenceSubclass(MutableSequence):
def __init__(self):
diff --git a/Lib/test/test_dataclasses.py b/Lib/test/test_dataclasses.py
index 9d08a2d4c91..18ca202ca74 100755
--- a/Lib/test/test_dataclasses.py
+++ b/Lib/test/test_dataclasses.py
@@ -998,7 +998,7 @@ def __post_init__(self):
self.assertEqual(C().x, 0)
self.assertEqual(C(2).x, 4)
- # Make sure that if we'r frozen, post-init can't set
+ # Make sure that if we're frozen, post-init can't set
# attributes.
@dataclass(frozen=True)
class C:
diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
index 35ec2e2f481..2245b974339 100644
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -420,7 +420,7 @@ def __str__(self):
p.keywords[self] = ['sth2']
return 'astr'
- # Raplacing the value during key formatting should keep the original
+ # Replacing the value during key formatting should keep the original
# value alive (at least long enough).
p.keywords[MutatesYourDict()] = ['sth']
r = repr(p)
diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index f88c762581d..bd17ad4a21b 100644
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -1458,7 +1458,7 @@ def remove_from_successors(i0, len=len):
# If we create a square with one exit, we must visit it next;
# else somebody else will have to visit it, and since there's
# only one adjacent, there won't be a way to leave it again.
- # Finelly, if we create more than one free square with a
+ # Finally, if we create more than one free square with a
# single exit, we can only move to one of them next, leaving
# the other one a dead end.
ne0 = ne1 = 0
diff --git a/Lib/test/test_importlib/builtin/test_finder.py b/Lib/test/test_importlib/builtin/test_finder.py
index a2e6e1edc36..084f3de6b65 100644
--- a/Lib/test/test_importlib/builtin/test_finder.py
+++ b/Lib/test/test_importlib/builtin/test_finder.py
@@ -22,7 +22,7 @@ def test_module(self):
# Built-in modules cannot be a package.
test_package = None
- # Built-in modules cannobt be in a package.
+ # Built-in modules cannot be in a package.
test_module_in_package = None
# Built-in modules cannot be a package.
diff --git a/Lib/test/test_importlib/source/test_file_loader.py b/Lib/test/test_importlib/source/test_file_loader.py
index 643a02c9ad6..cc80f26357e 100644
--- a/Lib/test/test_importlib/source/test_file_loader.py
+++ b/Lib/test/test_importlib/source/test_file_loader.py
@@ -267,7 +267,7 @@ def test_checked_hash_based_pyc(self):
)
@util.writes_bytecode_files
- def test_overriden_checked_hash_based_pyc(self):
+ def test_overridden_checked_hash_based_pyc(self):
with util.create_modules('_temp') as mapping, \
unittest.mock.patch('_imp.check_hash_based_pycs', 'never'):
source = mapping['_temp']
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index 13a86b12dd3..5b5bc650d2f 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -1569,7 +1569,7 @@ class Foo(object):
foo.__dict__['d'] = 1
self.assertEqual(inspect.getattr_static(foo, 'd'), 1)
- # if the descriptor is a data-desciptor we should return the
+ # if the descriptor is a data-descriptor we should return the
# descriptor
descriptor.__set__ = lambda s, i, v: None
self.assertEqual(inspect.getattr_static(foo, 'd'), Foo.__dict__['d'])
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 66748317b5f..9bfe4b0bc6e 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -579,7 +579,7 @@ def test_raw_bytes_io(self):
self.read_ops(f, True)
def test_large_file_ops(self):
- # On Windows and Mac OSX this test comsumes large resources; It takes
+ # On Windows and Mac OSX this test consumes large resources; It takes
# a long time to build the >2 GiB file and takes >2 GiB of disk space
# therefore the resource must be enabled to run this test.
if sys.platform[:3] == 'win' or sys.platform == 'darwin':
diff --git a/Lib/test/test_largefile.py b/Lib/test/test_largefile.py
index f409c5b5110..21296ccafe5 100644
--- a/Lib/test/test_largefile.py
+++ b/Lib/test/test_largefile.py
@@ -141,7 +141,7 @@ def setUpModule():
except (ImportError, AttributeError):
pass
- # On Windows and Mac OSX this test comsumes large resources; It
+ # On Windows and Mac OSX this test consumes large resources; It
# takes a long time to build the >2 GiB file and takes >2 GiB of disk
# space therefore the resource must be enabled to run this test.
# If not, nothing after this line stanza will be executed.
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 7101e3b1576..54049d2fb36 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -178,7 +178,7 @@ class BuiltinLevelsTest(BaseTest):
"""Test builtin levels and their inheritance."""
def test_flat(self):
- #Logging levels in a flat logger namespace.
+ # Logging levels in a flat logger namespace.
m = self.next_message
ERR = logging.getLogger("ERR")
@@ -248,7 +248,7 @@ def test_nested_explicit(self):
])
def test_nested_inherited(self):
- #Logging levels in a nested namespace, inherited from parent loggers.
+ # Logging levels in a nested namespace, inherited from parent loggers.
m = self.next_message
INF = logging.getLogger("INF")
@@ -1913,9 +1913,9 @@ def test_encoding_plain_file(self):
def test_encoding_cyrillic_unicode(self):
log = logging.getLogger("test")
- #Get a message in Unicode: Do svidanya in Cyrillic (meaning goodbye)
+ # Get a message in Unicode: Do svidanya in Cyrillic (meaning goodbye)
message = '\u0434\u043e \u0441\u0432\u0438\u0434\u0430\u043d\u0438\u044f'
- #Ensure it's written in a Cyrillic encoding
+ # Ensure it's written in a Cyrillic encoding
writer_class = codecs.getwriter('cp1251')
writer_class.encoding = 'cp1251'
stream = io.BytesIO()
@@ -1929,7 +1929,7 @@ def test_encoding_cyrillic_unicode(self):
handler.close()
# check we wrote exactly those bytes, ignoring trailing \n etc
s = stream.getvalue()
- #Compare against what the data should be when encoded in CP-1251
+ # Compare against what the data should be when encoded in CP-1251
self.assertEqual(s, b'\xe4\xee \xf1\xe2\xe8\xe4\xe0\xed\xe8\xff\n')
@@ -1950,7 +1950,7 @@ def test_warnings(self):
h.close()
self.assertGreater(s.find("UserWarning: I'm warning you...\n"), 0)
- #See if an explicit file uses the original implementation
+ # See if an explicit file uses the original implementation
a_file = io.StringIO()
warnings.showwarning("Explicit", UserWarning, "dummy.py", 42,
a_file, "Dummy line")
@@ -2091,7 +2091,7 @@ class ConfigDictTest(BaseTest):
},
}
- #As config1 but with a misspelt level on a handler
+ # As config1 but with a misspelt level on a handler
config2a = {
'version': 1,
'formatters': {
@@ -2119,7 +2119,7 @@ class ConfigDictTest(BaseTest):
}
- #As config1 but with a misspelt level on a logger
+ # As config1 but with a misspelt level on a logger
config2b = {
'version': 1,
'formatters': {
@@ -2286,8 +2286,8 @@ class ConfigDictTest(BaseTest):
},
}
- #config 7 does not define compiler.parser but defines compiler.lexer
- #so compiler.parser should be disabled after applying it
+ # config 7 does not define compiler.parser but defines compiler.lexer
+ # so compiler.parser should be disabled after applying it
config7 = {
'version': 1,
'formatters': {
@@ -2432,7 +2432,7 @@ class ConfigDictTest(BaseTest):
},
}
- #As config1 but with a filter added
+ # As config1 but with a filter added
config10 = {
'version': 1,
'formatters': {
@@ -2466,7 +2466,7 @@ class ConfigDictTest(BaseTest):
},
}
- #As config1 but using cfg:// references
+ # As config1 but using cfg:// references
config11 = {
'version': 1,
'true_formatters': {
@@ -2497,7 +2497,7 @@ class ConfigDictTest(BaseTest):
},
}
- #As config11 but missing the version key
+ # As config11 but missing the version key
config12 = {
'true_formatters': {
'form1' : {
@@ -2527,7 +2527,7 @@ class ConfigDictTest(BaseTest):
},
}
- #As config11 but using an unsupported version
+ # As config11 but using an unsupported version
config13 = {
'version': 2,
'true_formatters': {
@@ -2728,7 +2728,7 @@ def test_config7_ok(self):
# Original logger output is empty.
self.assert_log_lines([])
- #Same as test_config_7_ok but don't disable old loggers.
+ # Same as test_config_7_ok but don't disable old loggers.
def test_config_8_ok(self):
with support.captured_stdout() as output:
self.apply_config(self.config1)
@@ -2809,15 +2809,15 @@ def test_config_9_ok(self):
with support.captured_stdout() as output:
self.apply_config(self.config9)
logger = logging.getLogger("compiler.parser")
- #Nothing will be output since both handler and logger are set to WARNING
+ # Nothing will be output since both handler and logger are set to WARNING
logger.info(self.next_message())
self.assert_log_lines([], stream=output)
self.apply_config(self.config9a)
- #Nothing will be output since both handler is still set to WARNING
+ # Nothing will be output since handler is still set to WARNING
logger.info(self.next_message())
self.assert_log_lines([], stream=output)
self.apply_config(self.config9b)
- #Message should now be output
+ # Message should now be output
logger.info(self.next_message())
self.assert_log_lines([
('INFO', '3'),
@@ -2829,13 +2829,13 @@ def test_config_10_ok(self):
logger = logging.getLogger("compiler.parser")
logger.warning(self.next_message())
logger = logging.getLogger('compiler')
- #Not output, because filtered
+ # Not output, because filtered
logger.warning(self.next_message())
logger = logging.getLogger('compiler.lexer')
- #Not output, because filtered
+ # Not output, because filtered
logger.warning(self.next_message())
logger = logging.getLogger("compiler.parser.codegen")
- #Output, as not filtered
+ # Output, as not filtered
logger.error(self.next_message())
self.assert_log_lines([
('WARNING', '1'),
@@ -2894,13 +2894,13 @@ def test_listen_config_10_ok(self):
logger = logging.getLogger("compiler.parser")
logger.warning(self.next_message())
logger = logging.getLogger('compiler')
- #Not output, because filtered
+ # Not output, because filtered
logger.warning(self.next_message())
logger = logging.getLogger('compiler.lexer')
- #Not output, because filtered
+ # Not output, because filtered
logger.warning(self.next_message())
logger = logging.getLogger("compiler.parser.codegen")
- #Output, as not filtered
+ # Output, as not filtered
logger.error(self.next_message())
self.assert_log_lines([
('WARNING', '1'),
@@ -4335,7 +4335,7 @@ def test_rollover(self):
break
msg = 'No rotated files found, went back %d seconds' % GO_BACK
if not found:
- #print additional diagnostics
+ # print additional diagnostics
dn, fn = os.path.split(self.fn)
files = [f for f in os.listdir(dn) if f.startswith(fn)]
print('Test time: %s' % now.strftime("%Y-%m-%d %H-%M-%S"), file=sys.stderr)
diff --git a/Lib/test/test_math.py b/Lib/test/test_math.py
index 70cb57465f5..44785d3e49a 100644
--- a/Lib/test/test_math.py
+++ b/Lib/test/test_math.py
@@ -1423,7 +1423,7 @@ def assertIsNaN(self, value):
class IsCloseTests(unittest.TestCase):
- isclose = math.isclose # sublcasses should override this
+ isclose = math.isclose # subclasses should override this
def assertIsClose(self, a, b, *args, **kwargs):
self.assertTrue(self.isclose(a, b, *args, **kwargs),
diff --git a/Lib/test/test_parser.py b/Lib/test/test_parser.py
index 647d391c798..2f1b2197809 100644
--- a/Lib/test/test_parser.py
+++ b/Lib/test/test_parser.py
@@ -30,7 +30,7 @@ def check_expr(self, s):
self.roundtrip(parser.expr, s)
def test_flags_passed(self):
- # The unicode literals flags has to be passed from the paser to AST
+ # The unicode literals flags has to be passed from the parser to AST
# generation.
suite = parser.suite("from __future__ import unicode_literals; x = ''")
code = suite.compile()
diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py
index e2db72330c5..468c4a467e5 100644
--- a/Lib/test/test_random.py
+++ b/Lib/test/test_random.py
@@ -24,7 +24,7 @@ def test_autoseed(self):
self.gen.seed()
state1 = self.gen.getstate()
time.sleep(0.1)
- self.gen.seed() # diffent seeds at different times
+ self.gen.seed() # different seeds at different times
state2 = self.gen.getstate()
self.assertNotEqual(state1, state2)
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 99e7b4f8402..266adf01e04 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -274,7 +274,7 @@ def test_getsitepackages(self):
'site-packages')
self.assertEqual(dirs[1], wanted)
elif os.sep == '/':
- # OS X non-framwework builds, Linux, FreeBSD, etc
+ # OS X non-framework builds, Linux, FreeBSD, etc
self.assertEqual(len(dirs), 1)
wanted = os.path.join('xoxo', 'lib',
'python%d.%d' % sys.version_info[:2],
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index b97a7688a60..5b4c5f9f8ca 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -1444,7 +1444,7 @@ def test_idna(self):
socket.gethostbyname(domain)
socket.gethostbyname_ex(domain)
socket.getaddrinfo(domain,0,socket.AF_UNSPEC,socket.SOCK_STREAM)
- # this may not work if the forward lookup choses the IPv6 address, as that doesn't
+ # this may not work if the forward lookup chooses the IPv6 address, as that doesn't
# have a reverse entry yet
# socket.gethostbyaddr('испытание.python.org')
@@ -4399,7 +4399,7 @@ def _testSmallReadNonBlocking(self):
self.write_file.write(self.write_msg)
self.write_file.flush()
self.evt2.set()
- # Avoid cloding the socket before the server test has finished,
+ # Avoid closing the socket before the server test has finished,
# otherwise system recv() will return 0 instead of EWOULDBLOCK.
self.serv_finished.wait(5.0)
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index c65290b945f..98d3e571b73 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -850,7 +850,7 @@ def test_cert_time_to_seconds(self):
self.cert_time_ok("Jan 5 09:34:61 2018 GMT", 1515144901)
self.cert_time_fail("Jan 5 09:34:62 2018 GMT") # invalid seconds
- # no special treatement for the special value:
+ # no special treatment for the special value:
# 99991231235959Z (rfc 5280)
self.cert_time_ok("Dec 31 23:59:59 9999 GMT", 253402300799.0)
diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
index ed9e6d4f492..51dd9d95b2d 100644
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -16,7 +16,7 @@ def basic():
# Many of the tests below are tricky because they involve pass statements.
# If there is implicit control flow around a pass statement (in an except
-# clause or else caluse) under what conditions do you set a line number
+# clause or else clause) under what conditions do you set a line number
# following that clause?
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
index 02812f32bc9..f2e3f8d8b22 100644
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -2332,7 +2332,7 @@ def test_basic(self):
sourcefile = serialize(doc, to_string=False)
self.assertEqual(next(ET.iterparse(sourcefile))[0], 'end')
- # With an explitit parser too (issue #9708)
+ # With an explicit parser too (issue #9708)
sourcefile = serialize(doc, to_string=False)
parser = ET.XMLParser(target=ET.TreeBuilder())
self.assertEqual(next(ET.iterparse(sourcefile, parser=parser))[0],
diff --git a/Lib/test/test_zipapp.py b/Lib/test/test_zipapp.py
index 948833b2006..73bddc79c17 100644
--- a/Lib/test/test_zipapp.py
+++ b/Lib/test/test_zipapp.py
@@ -365,7 +365,7 @@ def test_cmdline_copy_inplace(self):
args = [str(original), '-o', str(original)]
with self.assertRaises(SystemExit) as cm:
zipapp.main(args)
- # Program should exit with a non-zero returm code.
+ # Program should exit with a non-zero return code.
self.assertTrue(cm.exception.code)
def test_cmdline_copy_change_main(self):
@@ -375,7 +375,7 @@ def test_cmdline_copy_change_main(self):
args = [str(original), '-o', str(target), '-m', 'foo:bar']
with self.assertRaises(SystemExit) as cm:
zipapp.main(args)
- # Program should exit with a non-zero returm code.
+ # Program should exit with a non-zero return code.
self.assertTrue(cm.exception.code)
@patch('sys.stdout', new_callable=io.StringIO)
@@ -385,7 +385,7 @@ def test_info_command(self, mock_stdout):
args = [str(target), '--info']
with self.assertRaises(SystemExit) as cm:
zipapp.main(args)
- # Program should exit with a zero returm code.
+ # Program should exit with a zero return code.
self.assertEqual(cm.exception.code, 0)
self.assertEqual(mock_stdout.getvalue(), "Interpreter: <none>\n")
@@ -395,7 +395,7 @@ def test_info_error(self):
args = [str(target), '--info']
with self.assertRaises(SystemExit) as cm:
zipapp.main(args)
- # Program should exit with a non-zero returm code.
+ # Program should exit with a non-zero return code.
self.assertTrue(cm.exception.code)
diff --git a/Lib/tkinter/test/test_ttk/test_functions.py b/Lib/tkinter/test/test_ttk/test_functions.py
index a1b7cdfcd14..f8e69a9f416 100644
--- a/Lib/tkinter/test/test_ttk/test_functions.py
+++ b/Lib/tkinter/test/test_ttk/test_functions.py
@@ -149,7 +149,7 @@ def test_format_mapdict(self):
# but when passing a single state, it can be anything
valid = {'opt': [[1, 'value']]}
self.assertEqual(ttk._format_mapdict(valid), ('-opt', '1 value'))
- # special attention to single states which evalute to False
+ # special attention to single states which evaluate to False
for stateval in (None, 0, False, '', set()): # just some samples
valid = {'opt': [(stateval, 'value')]}
self.assertEqual(ttk._format_mapdict(valid),
@@ -251,7 +251,7 @@ def sample_expected(indent=0, indent_size=2):
self.assertEqual(ttk._format_layoutlist([])[0], '')
# _format_layoutlist always expects the second item (in every item)
- # to act like a dict (except when the value evalutes to False).
+ # to act like a dict (except when the value evaluates to False).
self.assertRaises(AttributeError,
ttk._format_layoutlist, [('a', 'b')])
diff --git a/Lib/tkinter/ttk.py b/Lib/tkinter/ttk.py
index 05c7364d203..e6c90cef7bb 100644
--- a/Lib/tkinter/ttk.py
+++ b/Lib/tkinter/ttk.py
@@ -83,7 +83,7 @@ def _mapdict_values(items):
# ['active selected', 'grey', 'focus', [1, 2, 3, 4]]
opt_val = []
for *state, val in items:
- # hacks for bakward compatibility
+ # hacks for backward compatibility
state[0] # raise IndexError if empty
if len(state) == 1:
# if it is empty (something that evaluates to False), then
diff --git a/Lib/turtledemo/__main__.py b/Lib/turtledemo/__main__.py
index 6daf694427d..17fe9a75e1c 100644
--- a/Lib/turtledemo/__main__.py
+++ b/Lib/turtledemo/__main__.py
@@ -259,7 +259,7 @@ def increase_size(self, dummy=None):
return 'break'
def update_mousewheel(self, event):
- # For wheel up, event.delte = 120 on Windows, -1 on darwin.
+ # For wheel up, event.delta = 120 on Windows, -1 on darwin.
# X-11 sends Control-Button-4 event instead.
if (event.delta < 0) == (not darwin):
return self.decrease_size()
diff --git a/Lib/unittest/test/testmock/testmagicmethods.py b/Lib/unittest/test/testmock/testmagicmethods.py
index 7993db33893..37623dcebc6 100644
--- a/Lib/unittest/test/testmock/testmagicmethods.py
+++ b/Lib/unittest/test/testmock/testmagicmethods.py
@@ -450,7 +450,7 @@ def test_divmod_and_rdivmod(self):
self.assertIsInstance(bar_direct, MagicMock)
# http://bugs.python.org/issue23310
- # Check if you can change behaviour of magic methds in MagicMock init
+ # Check if you can change behaviour of magic methods in MagicMock init
def test_magic_in_initialization(self):
m = MagicMock(**{'__str__.return_value': "12"})
self.assertEqual(str(m), "12")
diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py
index 7caef553efb..87277045b52 100644
--- a/Lib/xml/etree/ElementTree.py
+++ b/Lib/xml/etree/ElementTree.py
@@ -1062,7 +1062,7 @@ def _escape_cdata(text):
# escape character data
try:
# it's worth avoiding do-nothing calls for strings that are
- # shorter than 500 character, or so. assume that's, by far,
+ # shorter than 500 characters, or so. assume that's, by far,
# the most common case in most applications.
if "&" in text:
text = text.replace("&", "&")
diff --git a/Lib/xmlrpc/client.py b/Lib/xmlrpc/client.py
index 28525036c46..1e8bb5f1bb9 100644
--- a/Lib/xmlrpc/client.py
+++ b/Lib/xmlrpc/client.py
@@ -1127,7 +1127,7 @@ class Transport:
accept_gzip_encoding = True
# if positive, encode request using gzip if it exceeds this threshold
- # note that many server will get confused, so only use it if you know
+ # note that many servers will get confused, so only use it if you know
# that they can decode such a request
encode_threshold = None #None = don't encode
@@ -1258,7 +1258,7 @@ def close(self):
# Send HTTP request.
#
# @param host Host descriptor (URL or (URL, x509 info) tuple).
- # @param handler Targer RPC handler (a path relative to host)
+ # @param handler Target RPC handler (a path relative to host)
# @param request_body The XML-RPC request body
# @param debug Enable debugging if debug is true.
# @return An HTTPConnection.
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index cc6241f817a..bff4eae31b4 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -1081,7 +1081,7 @@ def buildLibraries():
def buildPythonDocs():
# This stores the documentation as Resources/English.lproj/Documentation
- # inside the framwork. pydoc and IDLE will pick it up there.
+ # inside the framework. pydoc and IDLE will pick it up there.
print("Install python documentation")
rootDir = os.path.join(WORKDIR, '_root')
buildDir = os.path.join('../../Doc')
diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
index baa2e917706..f1da9f7a839 100644
--- a/Modules/faulthandler.c
+++ b/Modules/faulthandler.c
@@ -1040,7 +1040,7 @@ faulthandler_fatal_error_c_thread(PyObject *self, PyObject *args)
}
/* wait until the thread completes: it will never occur, since Py_FatalError()
- exits the process immedialty. */
+ exits the process immediately. */
PyThread_acquire_lock(lock, WAIT_LOCK);
PyThread_release_lock(lock);
PyThread_free_lock(lock);
diff --git a/Tools/c-globals/check-c-globals.py b/Tools/c-globals/check-c-globals.py
index 1de69a8751c..e68ed9271fe 100644
--- a/Tools/c-globals/check-c-globals.py
+++ b/Tools/c-globals/check-c-globals.py
@@ -135,7 +135,7 @@ def _is_exception(name):
def _is_compiler(name):
return (
- # Python/Pythyon-ast.c
+ # Python/Python-ast.c
name.endswith('_type') or
name.endswith('_singleton') or
name.endswith('_attributes')
diff --git a/setup.py b/setup.py
index 09e35e50609..f1933f78dee 100644
--- a/setup.py
+++ b/setup.py
@@ -1399,7 +1399,7 @@ class db_found(Exception): pass
if host_platform == 'darwin':
# On OS X, there is no separate /usr/lib/libncursesw nor
# libpanelw. If we are here, we found a locally-supplied
- # version of libncursesw. There should be also be a
+ # version of libncursesw. There should also be a
# libpanelw. _XOPEN_SOURCE defines are usually excluded
# for OS X but we need _XOPEN_SOURCE_EXTENDED here for
# ncurses wide char support
More information about the Python-checkins
mailing list