diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-05-26 06:03:19 +0000 |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-05-26 06:03:19 +0000 |
| commit | 99c673771bd79596af92b9a8594306e1d6bf7161 (patch) | |
| tree | d466d1ab7fa6103235446580d672ec11349b3739 /Lib | |
| parent | d21823d2de708df5515b3f511cc057ee519b52d6 (diff) | |
| parent | ecaaa548245ae3431815a70162b0d6ef12700551 (diff) | |
| download | cpython-99c673771bd79596af92b9a8594306e1d6bf7161.tar.gz | |
Issue #27076: Merge spelling from 3.5
Diffstat (limited to 'Lib')
50 files changed, 60 insertions, 60 deletions
diff --git a/Lib/_osx_support.py b/Lib/_osx_support.py index b07e75d0e8..58e20cd0d8 100644 --- a/Lib/_osx_support.py +++ b/Lib/_osx_support.py @@ -151,7 +151,7 @@ def _find_appropriate_compiler(_config_vars): # can only be found inside Xcode.app if the "Command Line Tools" # are not installed. # - # Futhermore, the compiler that can be used varies between + # Furthermore, the compiler that can be used varies between # Xcode releases. Up to Xcode 4 it was possible to use 'gcc-4.2' # as the compiler, after that 'clang' should be used because # gcc-4.2 is either not present, or a copy of 'llvm-gcc' that diff --git a/Lib/asyncio/sslproto.py b/Lib/asyncio/sslproto.py index 9262860335..79b201c910 100644 --- a/Lib/asyncio/sslproto.py +++ b/Lib/asyncio/sslproto.py @@ -604,7 +604,7 @@ class SSLProtocol(protocols.Protocol): self._wakeup_waiter() self._session_established = True # In case transport.write() was already called. Don't call - # immediatly _process_write_backlog(), but schedule it: + # immediately _process_write_backlog(), but schedule it: # _on_handshake_complete() can be called indirectly from # _process_write_backlog(), and _process_write_backlog() is not # reentrant. diff --git a/Lib/cgi.py b/Lib/cgi.py index 26d2544408..189c6d5b4a 100755 --- a/Lib/cgi.py +++ b/Lib/cgi.py @@ -184,7 +184,7 @@ def parse(fp=None, environ=os.environ, keep_blank_values=0, strict_parsing=0): # parse query string function called from urlparse, -# this is done in order to maintain backward compatiblity. +# this is done in order to maintain backward compatibility. def parse_qs(qs, keep_blank_values=0, strict_parsing=0): """Parse a query given as a string argument.""" diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py index e5497b34a7..d6dd7efd5d 100644 --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -365,7 +365,7 @@ def namedtuple(typename, field_names, verbose=False, rename=False): >>> x, y = p # unpack like a regular tuple >>> x, y (11, 22) - >>> p.x + p.y # fields also accessable by name + >>> p.x + p.y # fields also accessible by name 33 >>> d = p._asdict() # convert to a dictionary >>> d['x'] diff --git a/Lib/distutils/msvc9compiler.py b/Lib/distutils/msvc9compiler.py index da4b21d22a..0b1fd19ff6 100644 --- a/Lib/distutils/msvc9compiler.py +++ b/Lib/distutils/msvc9compiler.py @@ -51,7 +51,7 @@ else: # A map keyed by get_platform() return values to values accepted by # 'vcvarsall.bat'. Note a cross-compile may combine these (eg, 'x86_amd64' is -# the param to cross-compile on x86 targetting amd64.) +# the param to cross-compile on x86 targeting amd64.) PLAT_TO_VCVARS = { 'win32' : 'x86', 'win-amd64' : 'amd64', diff --git a/Lib/distutils/tests/test_unixccompiler.py b/Lib/distutils/tests/test_unixccompiler.py index 7c95be56d3..efba27e1c8 100644 --- a/Lib/distutils/tests/test_unixccompiler.py +++ b/Lib/distutils/tests/test_unixccompiler.py @@ -126,7 +126,7 @@ class UnixCCompilerTestCase(unittest.TestCase): self.assertEqual(self.cc.linker_so[0], 'my_cc') @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for OS X') - def test_osx_explict_ldshared(self): + def test_osx_explicit_ldshared(self): # Issue #18080: # ensure that setting CC env variable does not change # explicit LDSHARED setting for linker diff --git a/Lib/email/_header_value_parser.py b/Lib/email/_header_value_parser.py index a7ce30e177..2226e137e1 100644 --- a/Lib/email/_header_value_parser.py +++ b/Lib/email/_header_value_parser.py @@ -2872,7 +2872,7 @@ def parse_content_type_header(value): _find_mime_parameters(ctype, value) return ctype ctype.append(token) - # XXX: If we really want to follow the formal grammer we should make + # XXX: If we really want to follow the formal grammar we should make # mantype and subtype specialized TokenLists here. Probably not worth it. if not value or value[0] != '/': ctype.defects.append(errors.InvalidHeaderDefect( diff --git a/Lib/email/parser.py b/Lib/email/parser.py index 8c9bc9e44e..555b172560 100644 --- a/Lib/email/parser.py +++ b/Lib/email/parser.py @@ -23,7 +23,7 @@ class Parser: textual representation of the message. The string must be formatted as a block of RFC 2822 headers and header - continuation lines, optionally preceeded by a `Unix-from' header. The + continuation lines, optionally preceded by a `Unix-from' header. The header block is terminated either by the end of the string or by a blank line. @@ -87,7 +87,7 @@ class BytesParser: textual representation of the message. The input must be formatted as a block of RFC 2822 headers and header - continuation lines, optionally preceeded by a `Unix-from' header. The + continuation lines, optionally preceded by a `Unix-from' header. The header block is terminated either by the end of the input or by a blank line. diff --git a/Lib/encodings/utf_16.py b/Lib/encodings/utf_16.py index 809bc9ab36..c61248242b 100644 --- a/Lib/encodings/utf_16.py +++ b/Lib/encodings/utf_16.py @@ -73,7 +73,7 @@ class IncrementalDecoder(codecs.BufferedIncrementalDecoder): self.decoder = None def getstate(self): - # additonal state info from the base class must be None here, + # additional state info from the base class must be None here, # as it isn't passed along to the caller state = codecs.BufferedIncrementalDecoder.getstate(self)[0] # additional state info we pass to the caller: diff --git a/Lib/encodings/utf_32.py b/Lib/encodings/utf_32.py index c0529285f6..cdf84d1412 100644 --- a/Lib/encodings/utf_32.py +++ b/Lib/encodings/utf_32.py @@ -68,7 +68,7 @@ class IncrementalDecoder(codecs.BufferedIncrementalDecoder): self.decoder = None def getstate(self): - # additonal state info from the base class must be None here, + # additional state info from the base class must be None here, # as it isn't passed along to the caller state = codecs.BufferedIncrementalDecoder.getstate(self)[0] # additional state info we pass to the caller: diff --git a/Lib/html/parser.py b/Lib/html/parser.py index 43e6411b73..b781c63f33 100644 --- a/Lib/html/parser.py +++ b/Lib/html/parser.py @@ -143,7 +143,7 @@ class HTMLParser(_markupbase.ParserBase): # or there's more text incoming. If the latter is True, # we can't pass the text to handle_data in case we have # a charref cut in half at end. Try to determine if - # this is the case before proceding by looking for an + # this is the case before proceeding by looking for an # & near the end and see if it's followed by a space or ;. amppos = rawdata.rfind('&', max(i, n-34)) if (amppos >= 0 and diff --git a/Lib/http/cookies.py b/Lib/http/cookies.py index dbddd6cb8c..a73fe387f8 100644 --- a/Lib/http/cookies.py +++ b/Lib/http/cookies.py @@ -156,7 +156,7 @@ class CookieError(Exception): # a two-way quoting algorithm. Any non-text character is translated # into a 4 character sequence: a forward-slash followed by the # three-digit octal equivalent of the character. Any '\' or '"' is -# quoted with a preceeding '\' slash. +# quoted with a preceding '\' slash. # Because of the way browsers really handle cookies (as opposed to what # the RFC says) we also encode "," and ";". # diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py index fa99f5600f..afc31ee5e8 100644 --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -1065,7 +1065,7 @@ def _calc___package__(globals): def __import__(name, globals=None, locals=None, fromlist=(), level=0): """Import a module. - The 'globals' argument is used to infer where the import is occuring from + The 'globals' argument is used to infer where the import is occurring from to handle relative imports. The 'locals' argument is ignored. The 'fromlist' argument specifies what should exist as attributes on the module being imported (e.g. ``from module import <fromlist>``). The 'level' diff --git a/Lib/lib2to3/btm_utils.py b/Lib/lib2to3/btm_utils.py index 339750edba..ff76ba3404 100644 --- a/Lib/lib2to3/btm_utils.py +++ b/Lib/lib2to3/btm_utils.py @@ -215,7 +215,7 @@ def reduce_tree(node, parent=None): #reduce to None new_node = None elif repeater_node.children[0].value == '+': - #reduce to a single occurence i.e. do nothing + #reduce to a single occurrence i.e. do nothing pass else: #TODO: handle {min, max} repeaters diff --git a/Lib/lib2to3/fixes/fix_metaclass.py b/Lib/lib2to3/fixes/fix_metaclass.py index eca3334ce6..8e34463bd8 100644 --- a/Lib/lib2to3/fixes/fix_metaclass.py +++ b/Lib/lib2to3/fixes/fix_metaclass.py @@ -25,7 +25,7 @@ from ..fixer_util import syms, Node, Leaf def has_metaclass(parent): """ we have to check the cls_node without changing it. - There are two possiblities: + There are two possibilities: 1) clsdef => suite => simple_stmt => expr_stmt => Leaf('__meta') 2) clsdef => simple_stmt => expr_stmt => Leaf('__meta') """ diff --git a/Lib/lib2to3/patcomp.py b/Lib/lib2to3/patcomp.py index 2012ec4855..06a4b9dd23 100644 --- a/Lib/lib2to3/patcomp.py +++ b/Lib/lib2to3/patcomp.py @@ -3,7 +3,7 @@ """Pattern compiler. -The grammer is taken from PatternGrammar.txt. +The grammar is taken from PatternGrammar.txt. The compiler compiles a pattern to a pytree.*Pattern instance. """ diff --git a/Lib/locale.py b/Lib/locale.py index 206cdb3cc5..4de0090ed9 100644 --- a/Lib/locale.py +++ b/Lib/locale.py @@ -1455,7 +1455,7 @@ windows_locale = { 0x1809: "en_IE", # English - Ireland 0x1c09: "en_ZA", # English - South Africa 0x2009: "en_JA", # English - Jamaica - 0x2409: "en_CB", # English - Carribbean + 0x2409: "en_CB", # English - Caribbean 0x2809: "en_BZ", # English - Belize 0x2c09: "en_TT", # English - Trinidad 0x3009: "en_ZW", # English - Zimbabwe diff --git a/Lib/msilib/schema.py b/Lib/msilib/schema.py index 70fe138b7c..eeb3ecd27a 100644 --- a/Lib/msilib/schema.py +++ b/Lib/msilib/schema.py @@ -731,7 +731,7 @@ _Validation_records = [ ('CustomAction','Type','N',1,16383,None, None, None, None, 'The numeric custom action type, consisting of source location, code type, entry, option flags.',), ('CustomAction','Action','N',None, None, None, None, 'Identifier',None, 'Primary key, name of action, normally appears in sequence table unless private use.',), ('CustomAction','Source','Y',None, None, None, None, 'CustomSource',None, 'The table reference of the source of the code.',), -('CustomAction','Target','Y',None, None, None, None, 'Formatted',None, 'Excecution parameter, depends on the type of custom action',), +('CustomAction','Target','Y',None, None, None, None, 'Formatted',None, 'Execution parameter, depends on the type of custom action',), ('DrLocator','Signature_','N',None, None, None, None, 'Identifier',None, 'The Signature_ represents a unique file signature and is also the foreign key in the Signature table.',), ('DrLocator','Path','Y',None, None, None, None, 'AnyPath',None, 'The path on the user system. This is either a subpath below the value of the Parent or a full path. The path may contain properties enclosed within [ ] that will be expanded.',), ('DrLocator','Depth','Y',0,32767,None, None, None, None, 'The depth below the path to which the Signature_ is recursively searched. If absent, the depth is assumed to be 0.',), diff --git a/Lib/pdb.py b/Lib/pdb.py index 4cba8a0c74..b79359db50 100755 --- a/Lib/pdb.py +++ b/Lib/pdb.py @@ -300,7 +300,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 + # 'yield from' or a generator controlled by a for loop. No exception has # 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 diff --git a/Lib/pickle.py b/Lib/pickle.py index a60b1b74c5..963b5950b1 100644 --- a/Lib/pickle.py +++ b/Lib/pickle.py @@ -1002,7 +1002,7 @@ class _Unpickler: meets this interface. Optional keyword arguments are *fix_imports*, *encoding* and - *errors*, which are used to control compatiblity support for + *errors*, which are used to control compatibility support for pickle stream generated by Python 2. If *fix_imports* is True, pickle will try to map the old Python 2 names to the new names used in Python 3. The *encoding* and *errors* tell pickle how diff --git a/Lib/test/cfgparser.2 b/Lib/test/cfgparser.2 index 19a420a9a5..1646de8e65 100644 --- a/Lib/test/cfgparser.2 +++ b/Lib/test/cfgparser.2 @@ -282,7 +282,7 @@ # either /etc/hosts OR DNS or NIS depending on the settings of # /etc/host.config, /etc/nsswitch.conf # and the /etc/resolv.conf file. "host" therefore is system -# configuration dependant. This parameter is most often of use to +# configuration dependent. This parameter is most often of use to # prevent DNS lookups # in order to resolve NetBIOS names to IP Addresses. Use with care! # The example below excludes use of name resolution for machines that diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py index 1f992f9747..8fc01390b3 100644 --- a/Lib/test/datetimetester.py +++ b/Lib/test/datetimetester.py @@ -1228,7 +1228,7 @@ class TestDate(HarmlessMixedComparison, unittest.TestCase): #self.assertRaises(ValueError, t.strftime, "%#") #oh well, some systems just ignore those invalid ones. - #at least, excercise them to make sure that no crashes + #at least, exercise them to make sure that no crashes #are generated for f in ["%e", "%", "%#"]: try: @@ -2513,7 +2513,7 @@ class TestTime(HarmlessMixedComparison, unittest.TestCase): self.theclass(bytes([1] * len(base)), 'EST') # A mixin for classes with a tzinfo= argument. Subclasses must define -# theclass as a class atribute, and theclass(1, 1, 1, tzinfo=whatever) +# theclass as a class attribute, and theclass(1, 1, 1, tzinfo=whatever) # must be legit (which is true for time and datetime). class TZInfoBase: diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py index 4803826024..58f7253b4f 100644 --- a/Lib/test/test_asyncio/test_subprocess.py +++ b/Lib/test/test_asyncio/test_subprocess.py @@ -407,7 +407,7 @@ class SubprocessMixin: transport, protocol = yield from create proc = transport.get_extra_info('subprocess') - # kill the process (but asyncio is not notified immediatly) + # kill the process (but asyncio is not notified immediately) proc.kill() proc.wait() diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py index a7a3df7475..a0746f097a 100644 --- a/Lib/test/test_capi.py +++ b/Lib/test/test_capi.py @@ -464,7 +464,7 @@ class SkipitemTest(unittest.TestCase): test and not for the other, there's a mismatch, and the test fails. ** Some format units have special funny semantics and it would - be difficult to accomodate them here. Since these are all + be difficult to accommodate them here. Since these are all well-established and properly skipped in skipitem() we can get away with not testing them--this test is really intended to catch *new* format units. diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py index b99740b47d..cdb93088a2 100644 --- a/Lib/test/test_concurrent_futures.py +++ b/Lib/test/test_concurrent_futures.py @@ -676,7 +676,7 @@ class FutureTests(unittest.TestCase): self.assertEqual(SUCCESSFUL_FUTURE.result(timeout=0), 42) def test_result_with_success(self): - # TODO(brian@sweetapp.com): This test is timing dependant. + # TODO(brian@sweetapp.com): This test is timing dependent. def notification(): # Wait until the main thread is waiting for the result. time.sleep(1) @@ -689,7 +689,7 @@ class FutureTests(unittest.TestCase): self.assertEqual(f1.result(timeout=5), 42) def test_result_with_cancel(self): - # TODO(brian@sweetapp.com): This test is timing dependant. + # TODO(brian@sweetapp.com): This test is timing dependent. def notification(): # Wait until the main thread is waiting for the result. time.sleep(1) diff --git a/Lib/test/test_crypt.py b/Lib/test/test_crypt.py index 624d702f99..e4f58979c1 100644 --- a/Lib/test/test_crypt.py +++ b/Lib/test/test_crypt.py @@ -25,7 +25,7 @@ class CryptTestCase(unittest.TestCase): self.assertEqual(len(pw), method.total_size) def test_methods(self): - # Gurantee that METHOD_CRYPT is the last method in crypt.methods. + # Guarantee that METHOD_CRYPT is the last method in crypt.methods. self.assertTrue(len(crypt.methods) >= 1) self.assertEqual(crypt.METHOD_CRYPT, crypt.methods[-1]) diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py index b9bd1353f5..2068fb70f8 100644 --- a/Lib/test/test_doctest.py +++ b/Lib/test/test_doctest.py @@ -324,7 +324,7 @@ containing test: >>> test.lineno + e2.lineno 26 -If the docstring contains inconsistant leading whitespace in the +If the docstring contains inconsistent leading whitespace in the expected output of an example, then `DocTest` will raise a ValueError: >>> docstring = r''' diff --git a/Lib/test/test_email/test__header_value_parser.py b/Lib/test/test_email/test__header_value_parser.py index d028f7440b..f7ac0e3ded 100644 --- a/Lib/test/test_email/test__header_value_parser.py +++ b/Lib/test/test_email/test__header_value_parser.py @@ -2498,7 +2498,7 @@ class Test_parse_mime_parameters(TestParserMixin, TestEmailBase): # Note that it is undefined what we should do for error recovery when # there are duplicate parameter names or duplicate parts in a split # part. We choose to ignore all duplicate parameters after the first - # and to take duplicate or missing rfc 2231 parts in apperance order. + # and to take duplicate or missing rfc 2231 parts in appearance order. # This is backward compatible with get_param's behavior, but the # decisions are arbitrary. diff --git a/Lib/test/test_email/test_contentmanager.py b/Lib/test/test_email/test_contentmanager.py index cdb04e45ed..169058eac8 100644 --- a/Lib/test/test_email/test_contentmanager.py +++ b/Lib/test/test_email/test_contentmanager.py @@ -621,7 +621,7 @@ class TestRawDataManager(TestEmailBase): self.assertEqual(m.get_content(), content) def test_set_application_octet_stream_with_8bit_cte(self): - # In 8bit mode, univeral line end logic applies. It is up to the + # In 8bit mode, universal line end logic applies. It is up to the # application to make sure the lines are short enough; we don't check. m = self._make_message() content = b'b\xFFgus\tcon\nt\rent\n' + b'z'*60 + b'\n' diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py index a22d2e6609..9cf115d42b 100644 --- a/Lib/test/test_functools.py +++ b/Lib/test/test_functools.py @@ -1506,7 +1506,7 @@ class TestSingleDispatch(unittest.TestCase): object]) # MutableSequence below is registered directly on D. In other words, it - # preceeds MutableMapping which means single dispatch will always + # precedes MutableMapping which means single dispatch will always # choose MutableSequence here. class D(c.defaultdict): pass diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py index 0389b48f4e..f4b33afe14 100644 --- a/Lib/test/test_generators.py +++ b/Lib/test/test_generators.py @@ -1351,7 +1351,7 @@ class Queens: # For each square, compute a bit vector of the columns and # diagonals it covers, and for each row compute a function that - # generates the possiblities for the columns in that row. + # generates the possibilities for the columns in that row. self.rowgenerators = [] for i in rangen: rowuses = [(1 << j) | # column ordinal diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py index 8a297dd45e..c9b113e6ef 100644 --- a/Lib/test/test_hashlib.py +++ b/Lib/test/test_hashlib.py @@ -449,7 +449,7 @@ class KDFTests(unittest.TestCase): pbkdf2_results = { "sha1": [ - # offical test vectors from RFC 6070 + # official test vectors from RFC 6070 (bytes.fromhex('0c60c80f961f0e71f3a9b524af6012062fe037a6'), None), (bytes.fromhex('ea6c014dc72d6f8ccd1ed92ace1d41f0d8de8957'), None), (bytes.fromhex('4b007901b765489abead49d926f721d065a429c1'), None), diff --git a/Lib/test/test_http_cookiejar.py b/Lib/test/test_http_cookiejar.py index ea3c827fb7..585838bd6c 100644 --- a/Lib/test/test_http_cookiejar.py +++ b/Lib/test/test_http_cookiejar.py @@ -1729,7 +1729,7 @@ class LWPCookieTests(unittest.TestCase): key = "%s_after" % cookie.value counter[key] = counter[key] + 1 - # a permanent cookie got lost accidently + # a permanent cookie got lost accidentally self.assertEqual(counter["perm_after"], counter["perm_before"]) # a session cookie hasn't been cleared self.assertEqual(counter["session_after"], 0) diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py index b313aee63d..9b96a29737 100644 --- a/Lib/test/test_httpservers.py +++ b/Lib/test/test_httpservers.py @@ -100,7 +100,7 @@ class BaseHTTPServerTestCase(BaseTestCase): def do_EXPLAINERROR(self): self.send_error(999, "Short Message", - "This is a long \n explaination") + "This is a long \n explanation") def do_CUSTOM(self): self.send_response(999) diff --git a/Lib/test/test_linecache.py b/Lib/test/test_linecache.py index 240db7f874..375d9c4213 100644 --- a/Lib/test/test_linecache.py +++ b/Lib/test/test_linecache.py @@ -192,7 +192,7 @@ class LineCacheTests(unittest.TestCase): self.assertEqual( True, linecache.lazycache(NONEXISTENT_FILENAME, globals())) self.assertEqual(1, len(linecache.cache[NONEXISTENT_FILENAME])) - # Note here that we're looking up a non existant filename with no + # Note here that we're looking up a nonexistent filename with no # globals: this would error if the lazy value wasn't resolved. self.assertEqual(lines, linecache.getlines(NONEXISTENT_FILENAME)) diff --git a/Lib/test/test_lzma.py b/Lib/test/test_lzma.py index 2d39099f91..6c698e2f0e 100644 --- a/Lib/test/test_lzma.py +++ b/Lib/test/test_lzma.py @@ -1211,7 +1211,7 @@ class OpenTestCase(unittest.TestCase): self.assertEqual(f.read(), uncompressed) def test_encoding_error_handler(self): - # Test wih non-default encoding error handler. + # Test with non-default encoding error handler. with BytesIO(lzma.compress(b"foo\xffbar")) as bio: with lzma.open(bio, "rt", encoding="ascii", errors="ignore") as f: self.assertEqual(f.read(), "foobar") diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py index 44d66c388f..812db4cfa8 100644 --- a/Lib/test/test_memoryio.py +++ b/Lib/test/test_memoryio.py @@ -376,7 +376,7 @@ class MemoryTestMixin: # Pickle expects the class to be on the module level. Here we use a # little hack to allow the PickleTestMemIO class to derive from - # self.ioclass without having to define all combinations explictly on + # self.ioclass without having to define all combinations explicitly on # the module-level. import __main__ PickleTestMemIO.__module__ = '__main__' diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py index 2cddd57643..a63ccd83ca 100644 --- a/Lib/test/test_pdb.py +++ b/Lib/test/test_pdb.py @@ -823,7 +823,7 @@ def test_pdb_until_command_for_generator(): """ def test_pdb_next_command_in_generator_for_loop(): - """The next command on returning from a generator controled by a for loop. + """The next command on returning from a generator controlled by a for loop. >>> def test_gen(): ... yield 0 diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py index cdc12ed632..083ba2ea90 100644 --- a/Lib/test/test_pydoc.py +++ b/Lib/test/test_pydoc.py @@ -734,7 +734,7 @@ class PydocImportTest(PydocBaseTest): finally: sys.path[:] = saved_paths - @unittest.skip('causes undesireable side-effects (#20128)') + @unittest.skip('causes undesirable side-effects (#20128)') def test_modules(self): # See Helper.listmodules(). num_header_lines = 2 @@ -750,7 +750,7 @@ class PydocImportTest(PydocBaseTest): self.assertGreaterEqual(num_lines, expected) - @unittest.skip('causes undesireable side-effects (#20128)') + @unittest.skip('causes undesirable side-effects (#20128)') def test_modules_search(self): # See Helper.listmodules(). expected = 'pydoc - ' diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py index e584252ec2..49abfb3e71 100644 --- a/Lib/test/test_set.py +++ b/Lib/test/test_set.py @@ -1859,7 +1859,7 @@ class TestGraphs(unittest.TestCase): # http://en.wikipedia.org/wiki/Cuboctahedron # 8 triangular faces and 6 square faces - # 12 indentical vertices each connecting a triangle and square + # 12 identical vertices each connecting a triangle and square g = cube(3) cuboctahedron = linegraph(g) # V( --> {V1, V2, V3, V4} diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index a7cc1e7592..2764e6146d 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -198,7 +198,7 @@ class ThreadableTest: clientTearDown () Any new test functions within the class must then define - tests in pairs, where the test name is preceeded with a + tests in pairs, where the test name is preceded with a '_' to indicate the client portion of the test. Ex: def testFoo(self): @@ -4999,7 +4999,7 @@ class TestSocketSharing(SocketTCPTest): def compareSockets(self, org, other): # socket sharing is expected to work only for blocking socket - # since the internal python timout value isn't transfered. + # since the internal python timeout value isn't transferred. self.assertEqual(org.gettimeout(), None) self.assertEqual(org.gettimeout(), other.gettimeout()) diff --git a/Lib/test/test_telnetlib.py b/Lib/test/test_telnetlib.py index 69a9ce2a69..51d82e1158 100644 --- a/Lib/test/test_telnetlib.py +++ b/Lib/test/test_telnetlib.py @@ -241,8 +241,8 @@ class ReadTests(ExpectAndReadTestCase): self.assertEqual(data, want) def test_read_eager(self): - # read_eager and read_very_eager make the same gaurantees - # (they behave differently but we only test the gaurantees) + # read_eager and read_very_eager make the same guarantees + # (they behave differently but we only test the guarantees) self._read_eager('read_eager') self._read_eager('read_very_eager') # NB -- we need to test the IAC block which is mentioned in the diff --git a/Lib/test/test_winsound.py b/Lib/test/test_winsound.py index 7afb24b045..2a78388b2f 100644 --- a/Lib/test/test_winsound.py +++ b/Lib/test/test_winsound.py @@ -158,7 +158,7 @@ class PlaySoundTest(unittest.TestCase): ) def test_alias_fallback(self): - # In the absense of the ability to tell if a sound was actually + # In the absence of the ability to tell if a sound was actually # played, this test has two acceptable outcomes: success (no error, # sound was theoretically played; although as issue #19987 shows # a box without a soundcard can "succeed") or RuntimeError. Any diff --git a/Lib/test/tokenize_tests-latin1-coding-cookie-and-utf8-bom-sig.txt b/Lib/test/tokenize_tests-latin1-coding-cookie-and-utf8-bom-sig.txt index 2f53718dac..dc7c5f060a 100644 --- a/Lib/test/tokenize_tests-latin1-coding-cookie-and-utf8-bom-sig.txt +++ b/Lib/test/tokenize_tests-latin1-coding-cookie-and-utf8-bom-sig.txt @@ -2,7 +2,7 @@ # IMPORTANT: this file has the utf-8 BOM signature '\xef\xbb\xbf' # at the start of it. Make sure this is preserved if any changes # are made! Also note that the coding cookie above conflicts with -# the presense of a utf-8 BOM signature -- this is intended. +# the presence of a utf-8 BOM signature -- this is intended. # Arbitrary encoded utf-8 text (stolen from test_doctest2.py). x = 'ЉЊЈЁЂ' diff --git a/Lib/threading.py b/Lib/threading.py index cab1e708e0..d09fcae4e8 100644 --- a/Lib/threading.py +++ b/Lib/threading.py @@ -1063,7 +1063,7 @@ class Thread: # Issue #18808: wait for the thread state to be gone. # At the end of the thread's life, after all knowledge of the thread # is removed from C data structures, C code releases our _tstate_lock. - # This method passes its arguments to _tstate_lock.aquire(). + # This method passes its arguments to _tstate_lock.acquire(). # If the lock is acquired, the C code is done, and self._stop() is # called. That sets ._is_stopped to True, and ._tstate_lock to None. lock = self._tstate_lock diff --git a/Lib/tkinter/ttk.py b/Lib/tkinter/ttk.py index e22a4e0c37..8f217bf3f1 100644 --- a/Lib/tkinter/ttk.py +++ b/Lib/tkinter/ttk.py @@ -1016,7 +1016,7 @@ class Progressbar(Widget): """Begin autoincrement mode: schedules a recurring timer event that calls method step every interval milliseconds. - interval defaults to 50 milliseconds (20 steps/second) if ommited.""" + interval defaults to 50 milliseconds (20 steps/second) if omitted.""" self.tk.call(self._w, "start", interval) diff --git a/Lib/traceback.py b/Lib/traceback.py index 1bac6eb56b..3b46c0b050 100644 --- a/Lib/traceback.py +++ b/Lib/traceback.py @@ -136,7 +136,7 @@ def format_exception_only(etype, value): return list(TracebackException(etype, value, None).format_exception_only()) -# -- not offical API but folk probably use these two functions. +# -- not official API but folk probably use these two functions. def _format_final_exc_line(etype, value): valuestr = _some_str(value) @@ -418,13 +418,13 @@ class TracebackException: - :attr:`stack` A `StackSummary` representing the traceback. - :attr:`exc_type` The class of the original traceback. - :attr:`filename` For syntax errors - the filename where the error - occured. + occurred. - :attr:`lineno` For syntax errors - the linenumber where the error - occured. + occurred. - :attr:`text` For syntax errors - the text where the error - occured. + occurred. - :attr:`offset` For syntax errors - the offset into the text where the - error occured. + error occurred. - :attr:`msg` For syntax errors - the compiler error message. """ diff --git a/Lib/unittest/loader.py b/Lib/unittest/loader.py index b254c8086b..eb447d7ab6 100644 --- a/Lib/unittest/loader.py +++ b/Lib/unittest/loader.py @@ -387,7 +387,7 @@ class TestLoader(object): if tests is not None: yield tests if not should_recurse: - # Either an error occured, or load_tests was used by the + # Either an error occurred, or load_tests was used by the # package. return # Handle the contents. diff --git a/Lib/unittest/result.py b/Lib/unittest/result.py index a18f11bf5d..c7e3206d74 100644 --- a/Lib/unittest/result.py +++ b/Lib/unittest/result.py @@ -148,7 +148,7 @@ class TestResult(object): self.skipped.append((test, reason)) def addExpectedFailure(self, test, err): - """Called when an expected failure/error occured.""" + """Called when an expected failure/error occurred.""" self.expectedFailures.append( (test, self._exc_info_to_string(err, test))) diff --git a/Lib/wsgiref/headers.py b/Lib/wsgiref/headers.py index 7e670b3caf..fab851c5a4 100644 --- a/Lib/wsgiref/headers.py +++ b/Lib/wsgiref/headers.py @@ -69,7 +69,7 @@ class Headers: Return None if the header is missing instead of raising an exception. Note that if the header appeared multiple times, the first exactly which - occurrance gets returned is undefined. Use getall() to get all + occurrence gets returned is undefined. Use getall() to get all the values matching a header field name. """ return self.get(name) |