Spelling fixes to docs, docstrings, and comments (GH-6374)

diff --git a/Doc/library/email.generator.rst b/Doc/library/email.generator.rst
index cc8e8225a203ab974e283ace4fc27b7d3640f2c7..2575a51300705febe2fb4572b0bf4071aaeba371 100644 (file)
--- a/Doc/library/email.generator.rst
+++ b/Doc/library/email.generator.rst
@@ -185,7 +185,7 @@ to be using :class:`BytesGenerator`, and not :class:`Generator`.
       Convert any bytes with the high bit set as needed using an
       ASCII-compatible :mailheader:`Content-Transfer-Encoding`.  That is,
       transform parts with non-ASCII :mailheader:`Cotnent-Transfer-Encoding`
-      (:mailheader:`Content-Transfer-Encoding: 8bit`) to an ASCII compatibile
+      (:mailheader:`Content-Transfer-Encoding: 8bit`) to an ASCII compatible
       :mailheader:`Content-Transfer-Encoding`, and encode RFC-invalid non-ASCII
       bytes in headers using the MIME ``unknown-8bit`` character set, thus
       rendering them RFC-compliant.

diff --git a/Doc/library/test.rst b/Doc/library/test.rst
index 7b0971a83bcb6ea573401d2e707220675f87abd9..aeeed0042fce90c286ddedebb23daca5d5410e43 100644 (file)
--- a/Doc/library/test.rst
+++ b/Doc/library/test.rst
@@ -746,7 +746,7 @@ The :mod:`test.support` module defines the following functions:
 
 .. function:: wait_threads_exit(timeout=60.0)
 
-   Context manager to wait until all threads created in the ``with`` statment
+   Context manager to wait until all threads created in the ``with`` statement
    exit.
 
 

diff --git a/Include/context.h b/Include/context.h
index f872dceee0ca2db4ce327a4c7f88922d98c907e2..8b9f1292d75b6fbfba782ed8da0d0cd3d56e2e15 100644 (file)
--- a/Include/context.h
+++ b/Include/context.h
@@ -65,7 +65,7 @@ PyAPI_FUNC(PyContextToken *) PyContextVar_Set(
 
 
 /* Reset a variable to its previous value.
-   Returns 0 on sucess, -1 on error.
+   Returns 0 on success, -1 on error.
 */
 PyAPI_FUNC(int) PyContextVar_Reset(
     PyContextVar *var, PyContextToken *token);

diff --git a/Include/internal/hamt.h b/Include/internal/hamt.h
index 52488d0858dfcf83cd7f5c233c84e472531c64dd..29ad28b1d8706e77706bd0e1d1f59d4bc666fd4c 100644 (file)
--- a/Include/internal/hamt.h
+++ b/Include/internal/hamt.h
@@ -80,7 +80,7 @@ PyHamtObject * _PyHamt_Without(PyHamtObject *o, PyObject *key);
 /* Find "key" in the "o" collection.
 
    Return:
-   - -1: An error ocurred.
+   - -1: An error occurred.
    - 0: "key" wasn't found in "o".
    - 1: "key" is in "o"; "*val" is set to its value (a borrowed ref).
 */

diff --git a/Lib/_strptime.py b/Lib/_strptime.py
index 1be04850acf6e98d6ecc6af0a9cd9bf215e6a238..c8f2f94e5500cf0c72e0d962db2a7462717c4c52 100644 (file)
--- a/Lib/_strptime.py
+++ b/Lib/_strptime.py
@@ -463,7 +463,7 @@ def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"):
                     z = z[:3] + z[4:]
                     if len(z) > 5:
                         if z[5] != ':':
-                            msg = f"Unconsistent use of : in {found_dict['z']}"
+                            msg = f"Inconsistent use of : in {found_dict['z']}"
                             raise ValueError(msg)
                         z = z[:5] + z[6:]
                 hours = int(z[1:3])

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index c4aab2ee78b08f62cc4f1ed181304184615c6efe..c8b0caabd284c41a3751a278581df78fd3d9e809 100644 (file)
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -39,7 +39,7 @@ bpo-31860: The font sample in the settings dialog is now editable.
 Edits persist while IDLE remains open.
 Patch by Serhiy Storchake and Terry Jan Reedy.
 
-bpo-31858: Restrict shell prompt manipulaton to the shell.
+bpo-31858: Restrict shell prompt manipulation to the shell.
 Editor and output windows only see an empty last prompt line.  This
 simplifies the code and fixes a minor bug when newline is inserted.
 Sys.ps1, if present, is read on Shell start-up, but is not set or changed.

diff --git a/Lib/sqlite3/test/dbapi.py b/Lib/sqlite3/test/dbapi.py
index 5332975e0a651f4b5e3185ed3ea802d101ed492e..7c259d2af418febcf8293723990cec38d077cca0 100644 (file)
--- a/Lib/sqlite3/test/dbapi.py
+++ b/Lib/sqlite3/test/dbapi.py
@@ -161,7 +161,7 @@ class ConnectionTests(unittest.TestCase):
             self.cx.in_transaction = True
 
     def CheckOpenWithPathLikeObject(self):
-        """ Checks that we can succesfully connect to a database using an object that
+        """ Checks that we can successfully connect to a database using an object that
             is PathLike, i.e. has __fspath__(). """
         self.addCleanup(unlink, TESTFN)
         class Path:

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index 20185a9a595341896c94c956a114bb0ae0742c62..8b6bc4b23a02677d768d9985b108fa5268bb001e 100644 (file)
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -1104,7 +1104,7 @@ class _TestQueue(BaseTestCase):
             q = SafeQueue(ctx=multiprocessing.get_context())
             q.put(not_serializable_obj)
 
-            # Verify that q is still functionning correctly
+            # Verify that q is still functioning correctly
             q.put(True)
             self.assertTrue(q.get(timeout=1.0))
 

diff --git a/Lib/test/test__xxsubinterpreters.py b/Lib/test/test__xxsubinterpreters.py
index 397d3599312bec380e5100a529ab701574b9d157..4ef77716c662dd6ab9a09548b47f20f817864f09 100644 (file)
--- a/Lib/test/test__xxsubinterpreters.py
+++ b/Lib/test/test__xxsubinterpreters.py
@@ -1001,7 +1001,7 @@ class ChannelTests(TestBase):
             interpreters.channel_recv(cid)
 
     def test_drop_partially(self):
-        # XXX Is partial close too wierd/confusing?
+        # XXX Is partial close too weird/confusing?
         cid = interpreters.channel_create()
         interpreters.channel_send(cid, None)
         interpreters.channel_recv(cid)

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index bff1dc2d0638c231899c59af30d1e557bbf0114d..44501d922ad348dd8f9194c11f6b7416b50093e5 100644 (file)
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -5948,7 +5948,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase):
 @unittest.skipUnless(sys.platform.startswith("win"), "requires Windows")
 class TestMSWindowsTCPFlags(unittest.TestCase):
     knownTCPFlags = {
-                       # avaliable since long time ago
+                       # available since long time ago
                        'TCP_MAXSEG',
                        'TCP_NODELAY',
                        # available starting with Windows 10 1607

diff --git a/Lib/test/test_strptime.py b/Lib/test/test_strptime.py
index af71008bec537eb14f4bcd9c14b04a31c5b806eb..de2773f6aa2916ea7f733348090a01193a4387e9 100644 (file)
--- a/Lib/test/test_strptime.py
+++ b/Lib/test/test_strptime.py
@@ -363,7 +363,7 @@ class StrptimeTests(unittest.TestCase):
             _strptime._strptime("-01:30:30:123456", "%z")
         with self.assertRaises(ValueError) as err:
             _strptime._strptime("-01:3030", "%z")
-        self.assertEqual("Unconsistent use of : in -01:3030", str(err.exception))
+        self.assertEqual("Inconsistent use of : in -01:3030", str(err.exception))
 
     def test_timezone(self):
         # Test timezone directives.

diff --git a/Lib/typing.py b/Lib/typing.py
index d45502ffee48beef38f50398ccc083d39c01ad24..83296073b9147e09de114d7382f8c6eff1d12f54 100644 (file)
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -732,7 +732,7 @@ class _GenericAlias(_Final, _root=True):
         return (self.__origin__,)
 
     def __getattr__(self, attr):
-        # We are carefull for copy and pickle.
+        # We are careful for copy and pickle.
         # Also for simplicity we just don't relay all dunder names
         if '__origin__' in self.__dict__ and not _is_dunder(attr):
             return getattr(self.__origin__, attr)

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index acf757c9676a77a54ff686d320fcc6fa92ec7706..7a1bcebec6fdfd30b4ffe108f6540e65313c64b9 100644 (file)
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -2573,7 +2573,7 @@ PyDict_Copy(PyObject *o)
            (3) if 'mp' is non-compact ('del' operation does not resize dicts),
                do fast-copy only if it has at most 1/3 non-used keys.
 
-           The last condition (3) is important to guard against a pathalogical
+           The last condition (3) is important to guard against a pathological
            case when a large dict is almost emptied with multiple del/pop
            operations and copied after that.  In cases like this, we defer to
            PyDict_Merge, which produces a compacted copy.

diff --git a/Python/fileutils.c b/Python/fileutils.c
index 32aeea4f10374b6353a4186bf09ea91dcce656b8..35869c81ac9f746f3c242f9d3733eb4b9f825b6e 100644 (file)
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -431,7 +431,7 @@ decode_error:
    can be decoded as a surrogate character, escape the bytes using the
    surrogateescape error handler instead of decoding them.
 
-   On sucess, return 0 and write the newly allocated wide character string into
+   On success, return 0 and write the newly allocated wide character string into
    *wstr (use PyMem_RawFree() to free the memory). If wlen is not NULL, write
    the number of wide characters excluding the null character into *wlen.
 

diff --git a/Python/hamt.c b/Python/hamt.c
index 53a85723745ecbedfc004451c0d2d799e2333332..52171222b005ee82602922949010fbbdaf730275 100644 (file)
--- a/Python/hamt.c
+++ b/Python/hamt.c
@@ -39,7 +39,7 @@ Now let's partition this bit representation of the hash into blocks of
     0b00_00000_10010_11101_00101_01011_10000 = 19830128
           (6)   (5)   (4)   (3)   (2)   (1)
 
-Each block of 5 bits represents a number betwen 0 and 31.  So if we have
+Each block of 5 bits represents a number between 0 and 31.  So if we have
 a tree that consists of nodes, each of which is an array of 32 pointers,
 those 5-bit blocks will encode a position on a single tree level.
 
@@ -832,7 +832,7 @@ hamt_node_bitmap_assoc(PyHamtNode_Bitmap *self,
                pairs.
 
                Small hamt objects (<30 keys) usually don't have any
-               Array nodes at all.  Betwen ~30 and ~400 keys hamt
+               Array nodes at all.  Between ~30 and ~400 keys hamt
                objects usually have one Array node, and usually it's
                a root node.
             */