https://github.com/python/cpython/commit/84b023d2431eafd4548ef86502e37dd08fcb0000 commit: 84b023d2431eafd4548ef86502e37dd08fcb0000 branch: 3.12 author: Terry Jan Reedy <[email protected]> committer: terryjreedy <[email protected]> date: 2024-03-05T18:51:17Z summary:
[3.12] chore: fix typos (#116345) (#116370) Co-authored-by: cui fliter <[email protected]> (cherry picked from commit e7ba6e9dbe5433b4a0bcb0658da6a68197c28630) files: M Doc/library/idle.rst M Include/cpython/code.h M Include/internal/pycore_instruments.h M Lib/asyncio/tasks.py M Lib/importlib/util.py M Lib/test/libregrtest/run_workers.py M Lib/test/libregrtest/utils.py M Lib/test/test_asyncio/test_waitfor.py M Lib/test/test_baseexception.py M Tools/build/stable_abi.py diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst index 249dc0ea6ba735..17a5144b4c0635 100644 --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -604,7 +604,7 @@ in an editor window. The editing features described in previous subsections work when entering code interactively. IDLE's Shell window also responds to the following: -* :kbd:`C-c` attemps to interrupt statement execution (but may fail). +* :kbd:`C-c` attempts to interrupt statement execution (but may fail). * :kbd:`C-d` closes Shell if typed at a ``>>>`` prompt. diff --git a/Include/cpython/code.h b/Include/cpython/code.h index 03834b20c3e83e..311cffec113f0b 100644 --- a/Include/cpython/code.h +++ b/Include/cpython/code.h @@ -75,7 +75,7 @@ typedef struct { PyObject *_co_freevars; } _PyCoCached; -/* Ancilliary data structure used for instrumentation. +/* Ancillary data structure used for instrumentation. Line instrumentation creates an array of these. One entry per code unit.*/ typedef struct { diff --git a/Include/internal/pycore_instruments.h b/Include/internal/pycore_instruments.h index 87f70d2dc0d9ac..b8591563d76b6e 100644 --- a/Include/internal/pycore_instruments.h +++ b/Include/internal/pycore_instruments.h @@ -40,7 +40,7 @@ extern "C" { #define PY_MONITORING_EVENT_RERAISE 14 -/* Ancilliary events */ +/* Ancillary events */ #define PY_MONITORING_EVENT_C_RETURN 15 #define PY_MONITORING_EVENT_C_RAISE 16 diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py index 65f2a6ef800482..0b22e28d8e0469 100644 --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -480,7 +480,7 @@ async def wait_for(fut, timeout): If the wait is cancelled, the task is also cancelled. - If the task supresses the cancellation and returns a value instead, + If the task suppresses the cancellation and returns a value instead, that value is returned. This function is a coroutine. diff --git a/Lib/importlib/util.py b/Lib/importlib/util.py index 7a2311ff121ecb..f1bd06469cfc61 100644 --- a/Lib/importlib/util.py +++ b/Lib/importlib/util.py @@ -146,7 +146,7 @@ class _incompatible_extension_module_restrictions: You can get the same effect as this function by implementing the basic interface of multi-phase init (PEP 489) and lying about - support for mulitple interpreters (or per-interpreter GIL). + support for multiple interpreters (or per-interpreter GIL). """ def __init__(self, *, disable_check): diff --git a/Lib/test/libregrtest/run_workers.py b/Lib/test/libregrtest/run_workers.py index 7d2c1cd84cd1ee..3083a873fcebe9 100644 --- a/Lib/test/libregrtest/run_workers.py +++ b/Lib/test/libregrtest/run_workers.py @@ -209,7 +209,7 @@ def _run_process(self, runtests: WorkerRunTests, output_fd: int, self._popen = None def create_stdout(self, stack: contextlib.ExitStack) -> TextIO: - """Create stdout temporay file (file descriptor).""" + """Create stdout temporary file (file descriptor).""" if MS_WINDOWS: # gh-95027: When stdout is not a TTY, Python uses the ANSI code diff --git a/Lib/test/libregrtest/utils.py b/Lib/test/libregrtest/utils.py index af61e4220e0305..c77e36cd88e521 100644 --- a/Lib/test/libregrtest/utils.py +++ b/Lib/test/libregrtest/utils.py @@ -419,7 +419,7 @@ def get_work_dir(parent_dir: StrPath, worker: bool = False) -> StrPath: # the tests. The name of the dir includes the pid to allow parallel # testing (see the -j option). # Emscripten and WASI have stubbed getpid(), Emscripten has only - # milisecond clock resolution. Use randint() instead. + # millisecond clock resolution. Use randint() instead. if support.is_emscripten or support.is_wasi: nounce = random.randint(0, 1_000_000) else: diff --git a/Lib/test/test_asyncio/test_waitfor.py b/Lib/test/test_asyncio/test_waitfor.py index d52f32534a0cfe..11a8eeeab37634 100644 --- a/Lib/test/test_asyncio/test_waitfor.py +++ b/Lib/test/test_asyncio/test_waitfor.py @@ -249,8 +249,8 @@ async def test_cancel_wait_for(self): await self._test_cancel_wait_for(60.0) async def test_wait_for_cancel_suppressed(self): - # GH-86296: Supressing CancelledError is discouraged - # but if a task subpresses CancelledError and returns a value, + # GH-86296: Suppressing CancelledError is discouraged + # but if a task suppresses CancelledError and returns a value, # `wait_for` should return the value instead of raising CancelledError. # This is the same behavior as `asyncio.timeout`. diff --git a/Lib/test/test_baseexception.py b/Lib/test/test_baseexception.py index 4c3cf0b964ae56..6dc06c5e4bc9d5 100644 --- a/Lib/test/test_baseexception.py +++ b/Lib/test/test_baseexception.py @@ -129,7 +129,7 @@ class Value(str): d[HashThisKeyWillClearTheDict()] = Value() # refcount of Value() is 1 now - # Exception.__setstate__ should aquire a strong reference of key and + # Exception.__setstate__ should acquire a strong reference of key and # value in the dict. Otherwise, Value()'s refcount would go below # zero in the tp_hash call in PyObject_SetAttr(), and it would cause # crash in GC. diff --git a/Tools/build/stable_abi.py b/Tools/build/stable_abi.py index 4cd1cd953d0d29..c6363fda34998f 100644 --- a/Tools/build/stable_abi.py +++ b/Tools/build/stable_abi.py @@ -601,7 +601,7 @@ def check_private_names(manifest): if name.startswith('_') and not item.abi_only: raise ValueError( f'`{name}` is private (underscore-prefixed) and should be ' - + 'removed from the stable ABI list or or marked `abi_only`') + + 'removed from the stable ABI list or marked `abi_only`') def check_dump(manifest, filename): """Check that manifest.dump() corresponds to the data. _______________________________________________ Python-checkins mailing list -- [email protected] To unsubscribe send an email to [email protected] https://mail.python.org/mailman3/lists/python-checkins.python.org/ Member address: [email protected]
