Skip to content

Commit

Permalink
Fix typos mostly in comments, docs and test names (pythonGH-15209)
Browse files Browse the repository at this point in the history
  • Loading branch information
minho42 authored and terryjreedy committed Aug 30, 2019
1 parent 15119bc commit 39d87b5
Show file tree
Hide file tree
Showing 46 changed files with 60 additions and 60 deletions.
2 changes: 1 addition & 1 deletion Doc/c-api/init_config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@ Path Configuration
If at least one "output field" is not set, Python computes the path
configuration to fill unset fields. If
:c:member:`~PyConfig.module_search_paths_set` is equal to 0,
:c:member:`~PyConfig.module_search_paths` is overriden and
:c:member:`~PyConfig.module_search_paths` is overridden and
:c:member:`~PyConfig.module_search_paths_set` is set to 1.
It is possible to completely ignore the function computing the default
Expand Down
4 changes: 2 additions & 2 deletions Doc/library/importlib.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1379,8 +1379,8 @@ an :term:`importer`.
bytecode file. An empty string represents no optimization, so
``/foo/bar/baz.py`` with an *optimization* of ``''`` will result in a
bytecode path of ``/foo/bar/__pycache__/baz.cpython-32.pyc``. ``None`` causes
the interpter's optimization level to be used. Any other value's string
representation being used, so ``/foo/bar/baz.py`` with an *optimization* of
the interpreter's optimization level to be used. Any other value's string
representation is used, so ``/foo/bar/baz.py`` with an *optimization* of
``2`` will lead to the bytecode path of
``/foo/bar/__pycache__/baz.cpython-32.opt-2.pyc``. The string representation
of *optimization* can only be alphanumeric, else :exc:`ValueError` is raised.
Expand Down
2 changes: 1 addition & 1 deletion Include/pyhash.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ PyAPI_FUNC(PyHash_FuncDef*) PyHash_GetFuncDef(void);
* configure script.
*
* - FNV is available on all platforms and architectures.
* - SIPHASH24 only works on plaforms that don't require aligned memory for integers.
* - SIPHASH24 only works on platforms that don't require aligned memory for integers.
* - With EXTERNAL embedders can provide an alternative implementation with::
*
* PyHash_FuncDef PyHash_Func = {...};
Expand Down
4 changes: 2 additions & 2 deletions Lib/asyncio/streams.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def connect(host=None, port=None, *,
ssl_handshake_timeout=None,
happy_eyeballs_delay=None, interleave=None):
# Design note:
# Don't use decorator approach but exilicit non-async
# Don't use decorator approach but explicit non-async
# function to fail fast and explicitly
# if passed arguments don't match the function signature
return _ContextManagerHelper(_connect(host, port, limit,
Expand Down Expand Up @@ -442,7 +442,7 @@ def connect_unix(path=None, *,
ssl_handshake_timeout=None):
"""Similar to `connect()` but works with UNIX Domain Sockets."""
# Design note:
# Don't use decorator approach but exilicit non-async
# Don't use decorator approach but explicit non-async
# function to fail fast and explicitly
# if passed arguments don't match the function signature
return _ContextManagerHelper(_connect_unix(path,
Expand Down
2 changes: 1 addition & 1 deletion Lib/bdb.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def canonic(self, filename):
"""Return canonical form of filename.
For real filenames, the canonical form is a case-normalized (on
case insenstive filesystems) absolute path. 'Filenames' with
case insensitive filesystems) absolute path. 'Filenames' with
angle brackets, such as "<stdin>", generated in interactive
mode, are returned unchanged.
"""
Expand Down
2 changes: 1 addition & 1 deletion Lib/multiprocessing/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ def __repr__(self):
if self._kwargs:
x += ', kwargs=' + str(self._kwargs)
if self._key[0] is not None:
x += ', exitprority=' + str(self._key[0])
x += ', exitpriority=' + str(self._key[0])
return x + '>'


Expand Down
2 changes: 1 addition & 1 deletion Lib/test/lock_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ def _check_notify(self, cond):
# of the workers.
# Secondly, this test assumes that condition variables are not subject
# to spurious wakeups. The absence of spurious wakeups is an implementation
# detail of Condition Cariables in current CPython, but in general, not
# detail of Condition Variables in current CPython, but in general, not
# a guaranteed property of condition variables as a programming
# construct. In particular, it is possible that this can no longer
# be conveniently guaranteed should their implementation ever change.
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_cmd_line_script.py
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ def test_dash_m_errors(self):
('os.path', br'loader.*cannot handle'),
('importlib', br'No module named.*'
br'is a package and cannot be directly executed'),
('importlib.nonexistant', br'No module named'),
('importlib.nonexistent', br'No module named'),
('.unittest', br'Relative module names not supported'),
)
for name, regex in tests:
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_collections.py
Original file line number Diff line number Diff line change
Expand Up @@ -1927,7 +1927,7 @@ def test_order_preservation(self):
'r', 'c', 'd', ' ', 's', 's', 'i', 'i', 'm', 'm', 'l'])

# Math operations order first by the order encountered in the left
# operand and then by the order encounted in the right operand.
# operand and then by the order encountered in the right operand.
ps = 'aaabbcdddeefggghhijjjkkl'
qs = 'abbcccdeefffhkkllllmmnno'
order = {letter: i for i, letter in enumerate(dict.fromkeys(ps + qs))}
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_descr.py
Original file line number Diff line number Diff line change
Expand Up @@ -3025,7 +3025,7 @@ def test_str_subclass_as_dict_key(self):
# Testing a str subclass used as dict key ..

class cistr(str):
"""Sublcass of str that computes __eq__ case-insensitively.
"""Subclass of str that computes __eq__ case-insensitively.
Also computes a hash code of the string in canonical form.
"""
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_format.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def testformat(formatstr, args, output=None, limit=None, overflowok=False):

def testcommon(formatstr, args, output=None, limit=None, overflowok=False):
# if formatstr is a str, test str, bytes, and bytearray;
# otherwise, test bytes and bytearry
# otherwise, test bytes and bytearray
if isinstance(formatstr, str):
testformat(formatstr, args, output, limit, overflowok)
b_format = formatstr.encode('ascii')
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_gc.py
Original file line number Diff line number Diff line change
Expand Up @@ -912,7 +912,7 @@ def test_collect_generation(self):
def test_collect_garbage(self):
self.preclean()
# Each of these cause four objects to be garbage: Two
# Uncolectables and their instance dicts.
# Uncollectables and their instance dicts.
Uncollectable()
Uncollectable()
C1055820(666)
Expand Down
6 changes: 3 additions & 3 deletions Lib/test/test_hmac.py
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ def test_compare_digest(self):
a, b = bytearray(b"foobar"), bytearray(b"foobar")
self.assertTrue(hmac.compare_digest(a, b))

# Testing bytearrays of diffeent lengths
# Testing bytearrays of different lengths
a, b = bytearray(b"foobar"), bytearray(b"foo")
self.assertFalse(hmac.compare_digest(a, b))

Expand All @@ -458,7 +458,7 @@ def test_compare_digest(self):
self.assertTrue(hmac.compare_digest(a, b))
self.assertTrue(hmac.compare_digest(b, a))

# Testing byte bytearray of diffeent lengths
# Testing byte bytearray of different lengths
a, b = bytearray(b"foobar"), b"foo"
self.assertFalse(hmac.compare_digest(a, b))
self.assertFalse(hmac.compare_digest(b, a))
Expand All @@ -472,7 +472,7 @@ def test_compare_digest(self):
a, b = "foobar", "foobar"
self.assertTrue(hmac.compare_digest(a, b))

# Testing str of diffeent lengths
# Testing str of different lengths
a, b = "foo", "foobar"
self.assertFalse(hmac.compare_digest(a, b))

Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_importlib/source/test_file_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ def test_unchecked_hash_based_pyc(self):
)

@util.writes_bytecode_files
def test_overiden_unchecked_hash_based_pyc(self):
def test_overridden_unchecked_hash_based_pyc(self):
with util.create_modules('_temp') as mapping, \
unittest.mock.patch('_imp.check_hash_based_pycs', 'always'):
source = mapping['_temp']
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_importlib/test_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def test_new_style_classes(self):
class ImportTests(fixtures.DistInfoPkg, unittest.TestCase):
def test_import_nonexistent_module(self):
# Ensure that the MetadataPathFinder does not crash an import of a
# non-existant module.
# non-existent module.
with self.assertRaises(ImportError):
importlib.import_module('does_not_exist')

Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_importlib/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ def contents(self):
yield entry

name = 'testingpackage'
# Unforunately importlib.util.module_from_spec() was not introduced until
# Unfortunately importlib.util.module_from_spec() was not introduced until
# Python 3.5.
module = types.ModuleType(name)
loader = Reader()
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_statistics.py
Original file line number Diff line number Diff line change
Expand Up @@ -1810,13 +1810,13 @@ def test_bimodal_data(self):
# Test mode with bimodal data.
data = [1, 1, 2, 2, 2, 2, 3, 4, 5, 6, 6, 6, 6, 7, 8, 9, 9]
assert data.count(2) == data.count(6) == 4
# mode() should return 2, the first encounted mode
# mode() should return 2, the first encountered mode
self.assertEqual(self.func(data), 2)

def test_unique_data(self):
# Test mode when data points are all unique.
data = list(range(10))
# mode() should return 0, the first encounted mode
# mode() should return 0, the first encountered mode
self.assertEqual(self.func(data), 0)

def test_none_data(self):
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_tracemalloc.py
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,7 @@ def check_env_var_invalid(self, nframe):
return
if b'PYTHONTRACEMALLOC: invalid number of frames' in stderr:
return
self.fail(f"unexpeced output: {stderr!a}")
self.fail(f"unexpected output: {stderr!a}")


def test_env_var_invalid(self):
Expand Down Expand Up @@ -914,7 +914,7 @@ def check_sys_xoptions_invalid(self, nframe):
return
if b'-X tracemalloc=NFRAME: invalid number of frames' in stderr:
return
self.fail(f"unexpeced output: {stderr!a}")
self.fail(f"unexpected output: {stderr!a}")

def test_sys_xoptions_invalid(self):
for nframe in INVALID_NFRAME:
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_warnings/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@ def test_showwarning_not_callable(self):
self.assertRaises(TypeError, self.module.warn, "Warning!")

def test_show_warning_output(self):
# With showarning() missing, make sure that output is okay.
# With showwarning() missing, make sure that output is okay.
text = 'test show_warning'
with original_warnings.catch_warnings(module=self.module):
self.module.filterwarnings("always", category=UserWarning)
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_winreg.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ def test_connect_registry_to_local_machine_works(self):
h.Close()
self.assertEqual(h.handle, 0)

def test_inexistant_remote_registry(self):
def test_nonexistent_remote_registry(self):
connect = lambda: ConnectRegistry("abcdefghijkl", HKEY_CURRENT_USER)
self.assertRaises(OSError, connect)

Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_wsgiref.py
Original file line number Diff line number Diff line change
Expand Up @@ -586,10 +586,10 @@ def testEnviron(self):
expected.update({
# X doesn't exist in os_environ
"X": "Y",
# HOME is overriden by TestHandler
# HOME is overridden by TestHandler
'HOME': "/override/home",

# overriden by setup_testing_defaults()
# overridden by setup_testing_defaults()
"SCRIPT_NAME": "",
"SERVER_NAME": "127.0.0.1",

Expand Down
2 changes: 1 addition & 1 deletion Lib/tkinter/filedialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ def test():
except (ImportError, AttributeError):
pass

# dialog for openening files
# dialog for opening files

openfilename=askopenfilename(filetypes=[("all files", "*")])
try:
Expand Down
6 changes: 3 additions & 3 deletions Lib/unittest/test/testmock/testpatch.py
Original file line number Diff line number Diff line change
Expand Up @@ -1651,7 +1651,7 @@ def test_patch_imports_lazily(self):
p1.stop()
self.assertEqual(squizz.squozz, 3)

def test_patch_propogrates_exc_on_exit(self):
def test_patch_propagates_exc_on_exit(self):
class holder:
exc_info = None, None, None

Expand Down Expand Up @@ -1680,9 +1680,9 @@ def test(mock):

self.assertIs(holder.exc_info[0], RuntimeError)
self.assertIsNotNone(holder.exc_info[1],
'exception value not propgated')
'exception value not propagated')
self.assertIsNotNone(holder.exc_info[2],
'exception traceback not propgated')
'exception traceback not propagated')


def test_create_and_specs(self):
Expand Down
2 changes: 1 addition & 1 deletion Lib/uuid.py
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ def _random_getnode():
return random.getrandbits(48) | (1 << 40)


# _OS_GETTERS, when known, are targetted for a specific OS or platform.
# _OS_GETTERS, when known, are targeted for a specific OS or platform.
# The order is by 'common practice' on the specified platform.
# Note: 'posix' and 'windows' _OS_GETTERS are prefixed by a dll/dlload() method
# which, when successful, means none of these "external" methods are called.
Expand Down
4 changes: 2 additions & 2 deletions Misc/HISTORY
Original file line number Diff line number Diff line change
Expand Up @@ -1231,7 +1231,7 @@ Library
- Issue #22448: Improve canceled timer handles cleanup to prevent
unbound memory usage. Patch by Joshua Moore-Oliva.

- Issue #23009: Make sure selectors.EpollSelecrtor.select() works when no
- Issue #23009: Make sure selectors.EpollSelector.select() works when no
FD is registered.

IDLE
Expand Down Expand Up @@ -16660,7 +16660,7 @@ Core and Builtins
Exception (KeyboardInterrupt, and SystemExit) propagate instead of
ignoring them.

- #3021 Exception reraising sematics have been significantly improved. However,
- #3021 Exception reraising semantics have been significantly improved. However,
f_exc_type, f_exc_value, and f_exc_traceback cannot be accessed from Python
code anymore.

Expand Down
2 changes: 1 addition & 1 deletion Misc/NEWS.d/3.5.0a1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1255,7 +1255,7 @@ Support wrapped callables in doctest. Patch by Claudiu Popa.
.. nonce: -sW7gk
.. section: Library
Make sure selectors.EpollSelecrtor.select() works when no FD is registered.
Make sure selectors.EpollSelector.select() works when no FD is registered.

..
Expand Down
2 changes: 1 addition & 1 deletion Misc/NEWS.d/3.5.4rc1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -913,7 +913,7 @@ Fixed infinite recursion in the repr of uninitialized ctypes.CDLL instances.
Fixed race condition in C implementation of functools.lru_cache. KeyError
could be raised when cached function with full cache was simultaneously
called from differen threads with the same uncached arguments.
called from different threads with the same uncached arguments.

..
Expand Down
2 changes: 1 addition & 1 deletion Misc/NEWS.d/3.6.0b1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1148,7 +1148,7 @@ dict constraint in ForwardRef._eval_type (upstream #252)
.. nonce: hxh6_h
.. section: Library
Make ``_normalize`` parameter to ``Fraction`` constuctor keyword-only, so
Make ``_normalize`` parameter to ``Fraction`` constructor keyword-only, so
that ``Fraction(2, 3, 4)`` now raises ``TypeError``.

..
Expand Down
2 changes: 1 addition & 1 deletion Misc/NEWS.d/3.6.0rc1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ they still are deprecated and will be disabled in 3.7.
.. section: Library
Fix a regression introduced in warnings.catch_warnings(): call
warnings.showwarning() if it was overriden inside the context manager.
warnings.showwarning() if it was overridden inside the context manager.

..
Expand Down
2 changes: 1 addition & 1 deletion Misc/NEWS.d/3.6.1rc1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ Fix an important omission by adding Deque to the typing module.
Fixed race condition in C implementation of functools.lru_cache. KeyError
could be raised when cached function with full cache was simultaneously
called from differen threads with the same uncached arguments.
called from different threads with the same uncached arguments.

..
Expand Down
2 changes: 1 addition & 1 deletion Misc/NEWS.d/3.7.0a1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3651,7 +3651,7 @@ regular expression objects.
Fixed race condition in C implementation of functools.lru_cache. KeyError
could be raised when cached function with full cache was simultaneously
called from differen threads with the same uncached arguments.
called from different threads with the same uncached arguments.

..
Expand Down
2 changes: 1 addition & 1 deletion Misc/NEWS.d/3.8.0a1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2418,7 +2418,7 @@ over browsers in the ``BROWSER`` environment variable.
.. nonce: eSLKBE
.. section: Library
Avoid stripping trailing whitespace in doctest fancy diff. Orignial patch by
Avoid stripping trailing whitespace in doctest fancy diff. Original patch by
R. David Murray & Jairo Trad. Enhanced by Sanyam Khurana.

..
Expand Down
2 changes: 1 addition & 1 deletion Misc/NEWS.d/3.8.0a4.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1110,7 +1110,7 @@ Add ``-fmax-type-align=8`` to CFLAGS when clang compiler is detected. The
pymalloc memory allocator aligns memory on 8 bytes. On x86-64, clang expects
alignment on 16 bytes by default and so uses MOVAPS instruction which can
lead to segmentation fault. Instruct clang that Python is limited to
alignemnt on 8 bytes to use MOVUPS instruction instead: slower but don't
alignment on 8 bytes to use MOVUPS instruction instead: slower but don't
trigger a SIGSEGV if the memory is not aligned on 16 bytes. Sadly, the flag
must be added to ``CFLAGS`` and not just ``CFLAGS_NODIST``, since third
party C extensions can have the same issue.
Expand Down
2 changes: 1 addition & 1 deletion Misc/NEWS.d/3.8.0b1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1262,7 +1262,7 @@ Reinitialize logging.Handler locks in forked child processes instead of
attempting to acquire them all in the parent before forking only to be
released in the child process. The acquire/release pattern was leading to
deadlocks in code that has implemented any form of chained logging handlers
that depend upon one another as the lock acquision order cannot be
that depend upon one another as the lock acquisition order cannot be
guaranteed.

..
Expand Down
2 changes: 1 addition & 1 deletion Modules/_ctypes/callproc.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ static void pymem_destructor(PyObject *ptr)
WinDLL(..., use_last_error=True) swap the system LastError value with the
ctypes private copy.
The values are also swapped immeditately before and after ctypes callback
The values are also swapped immediately before and after ctypes callback
functions are called, if the callbacks are constructed using the new
optional use_errno parameter set to True: CFUNCTYPE(..., use_errno=TRUE) or
WINFUNCTYPE(..., use_errno=True).
Expand Down
2 changes: 1 addition & 1 deletion Modules/_ctypes/stgdict.c
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ PyCStructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct
int big_endian;

/* HACK Alert: I cannot be bothered to fix ctypes.com, so there has to
be a way to use the old, broken sematics: _fields_ are not extended
be a way to use the old, broken semantics: _fields_ are not extended
but replaced in subclasses.
XXX Remove this in ctypes 1.0!
Expand Down
Loading

0 comments on commit 39d87b5

Please sign in to comment.