#18466: fix more typos. Patch by Févry Thibault.

diff --git a/Include/datetime.h b/Include/datetime.h
index 47abe5cb865a52c05befa38de0fd07c858922c08..c0e7ffd00a9cd8f3a0c4bb1495f2f45884b71ee5 100644 (file)
--- a/Include/datetime.h
+++ b/Include/datetime.h
@@ -42,7 +42,7 @@ typedef struct
 
 typedef struct
 {
-    PyObject_HEAD               /* a pure abstract base clase */
+    PyObject_HEAD               /* a pure abstract base class */
 } PyDateTime_TZInfo;
 
 

diff --git a/Lib/collections.py b/Lib/collections.py
index b9df2c14c915861d4431c530e36fa709a2aed19f..0beb142be59703902b86d7cc481699b9cb802ba1 100644 (file)
--- a/Lib/collections.py
+++ b/Lib/collections.py
@@ -369,7 +369,7 @@ def namedtuple(typename, field_names, verbose=False, rename=False):
     result = namespace[typename]
 
     # For pickling to work, the __module__ variable needs to be set to the frame
-    # where the named tuple is created.  Bypass this step in enviroments where
+    # where the named tuple is created.  Bypass this step in environments where
     # sys._getframe is not defined (Jython for example) or sys._getframe is not
     # defined for arguments greater than 0 (IronPython).
     try:

diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index 4f80197f8d790e4abcb8297fa27978b3b51e2c4d..0a1ca4168a590856a801173c9cde9bc81d11c2ed 100644 (file)
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -18,7 +18,7 @@ def to_tuple(t):
 
 
 # These tests are compiled through "exec"
-# There should be atleast one test per statement
+# There should be at least one test per statement
 exec_tests = [
     # None
     "None",

diff --git a/Lib/test/test_cookielib.py b/Lib/test/test_cookielib.py
index dd0ad325d96e18ca980bbaf3926305bcbe67f477..a3c31f67a380fab980c348545aeab6cd7d9670a7 100644 (file)
--- a/Lib/test/test_cookielib.py
+++ b/Lib/test/test_cookielib.py
@@ -329,7 +329,7 @@ class CookieTests(TestCase):
 ##   commas and equals are commonly appear in the cookie value). This also
 ##   means that if you fold multiple Set-Cookie header fields into one,
 ##   comma-separated list, it'll be a headache to parse (at least my head
-##   starts hurting everytime I think of that code).
+##   starts hurting every time I think of that code).
 ## - Expires: You'll get all sorts of date formats in the expires,
 ##   including emtpy expires attributes ("expires="). Be as flexible as you
 ##   can, and certainly don't expect the weekday to be there; if you can't

diff --git a/Lib/test/test_datetime.py b/Lib/test/test_datetime.py
index d246d60797e34c9653fa65375f72abc661708dc7..13ff5a38a1805f9f3cb2a010afbc53127c3c1958 100644 (file)
--- a/Lib/test/test_datetime.py
+++ b/Lib/test/test_datetime.py
@@ -124,7 +124,7 @@ class TestTZInfo(unittest.TestCase):
             self.assertEqual(derived.tzname(None), 'cookie')
 
 #############################################################################
-# Base clase for testing a particular aspect of timedelta, time, date and
+# Base class for testing a particular aspect of timedelta, time, date and
 # datetime comparisons.
 
 class HarmlessMixedComparison:

diff --git a/Lib/test/test_normalization.py b/Lib/test/test_normalization.py
index 3040a086187e6f6cf09941e7bb758059475cc88d..1c45ad5c3147af9dff358391d91445cf2f8d76bf 100644 (file)
--- a/Lib/test/test_normalization.py
+++ b/Lib/test/test_normalization.py
@@ -57,7 +57,7 @@ class NormalizationTest(unittest.TestCase):
                 c1,c2,c3,c4,c5 = [unistr(x) for x in line.split(';')[:-1]]
             except RangeError:
                 # Skip unsupported characters;
-                # try atleast adding c1 if we are in part1
+                # try at least adding c1 if we are in part1
                 if part == "@Part1":
                     try:
                         c1 = unistr(line.split(';')[0])

diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index e60adb2335725255f26796124cce906a466d7622..3018ab198b4aeec36de2824247e2f021f5f9eb06 100644 (file)
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -812,7 +812,7 @@ class URLopener_Tests(unittest.TestCase):
 # Everywhere else they work ok, but on those machines, sometimes
 # fail in one of the tests, sometimes in other. I have a linux, and
 # the tests go ok.
-# If anybody has one of the problematic enviroments, please help!
+# If anybody has one of the problematic environments, please help!
 # .   Facundo
 #
 # def server(evt):

diff --git a/Misc/NEWS b/Misc/NEWS
index 40816c702e3bfd0ade37a78c529bb3409e347f0b..daa7e1fe7eaf225c88256bcb9af949d95f5f8fee 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -3443,7 +3443,7 @@ Library
 - Issue #1285086: Speed up ``urllib.quote()`` and urllib.unquote for simple
   cases.
 
-- Issue #8688: Distutils now recalculates MANIFEST everytime.
+- Issue #8688: Distutils now recalculates MANIFEST every time.
 
 - Issue #5099: The ``__del__()`` method of ``subprocess.Popen`` (and the methods
   it calls) referenced global objects, causing errors to pop up during
@@ -6299,7 +6299,7 @@ Library
 - Issue #3547: Fixed ctypes structures bitfields of varying integer
   sizes.
 
-- Issue #3879: A regression in urllib.getproxies_enviroment was fixed.
+- Issue #3879: A regression in urllib.getproxies_environment was fixed.
 
 - Issue #3863: Disabled a unit test of fork being called from a thread
   when running on platforms known to exhibit OS bugs when attempting that.

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index b6c2f6b32239eecc44cedad8f83481e8833ad48d..3ff76a583c3251d75e31068ab8ba53c419755261 100644 (file)
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -1455,7 +1455,7 @@ static PyObject *PySSL_SSLshutdown(PySSLObject *self)
          * Otherwise OpenSSL might read in too much data,
          * eating clear text data that happens to be
          * transmitted after the SSL shutdown.
-         * Should be safe to call repeatedly everytime this
+         * Should be safe to call repeatedly every time this
          * function is used and the shutdown_seen_zero != 0
          * condition is met.
          */

diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c
index 95bdf3cfd1eea93d8569845586a171d109b2c90f..edc811e08111a5d9f751687be2e96d1199835d3a 100644 (file)
--- a/Modules/unicodedata.c
+++ b/Modules/unicodedata.c
@@ -520,7 +520,7 @@ nfd_nfkd(PyObject *self, PyObject *input, int k)
         while(stackptr) {
             Py_UNICODE code = stack[--stackptr];
             /* Hangul Decomposition adds three characters in
-               a single step, so we need atleast that much room. */
+               a single step, so we need at least that much room. */
             if (space < 3) {
                 Py_ssize_t newsize = PyString_GET_SIZE(result) + 10;
                 space += 10;

diff --git a/PC/_subprocess.c b/PC/_subprocess.c
index 689b0c8b43375678c6d0d6d336c58fea67b3c374..195e343decbf91729ff1c7cb66952c1341538cb6 100644 (file)
--- a/PC/_subprocess.c
+++ b/PC/_subprocess.c
@@ -331,7 +331,7 @@ getenvironment(PyObject* environment)
     PyObject* values;
     char* p;
 
-    /* convert environment dictionary to windows enviroment string */
+    /* convert environment dictionary to windows environment string */
     if (! PyMapping_Check(environment)) {
         PyErr_SetString(
             PyExc_TypeError, "environment must be dictionary or None");

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 3395aac1bbd22ed95f6894fc7fcfa1ff003ca364..00b50ece97da0815137ea34a2f1b06993daab488 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -262,7 +262,7 @@ SDK, in particular the 64-bit support. This includes an Itanium compiler
 In addition, you need the Visual Studio plugin for external C compilers,
 from http://sf.net/projects/vsextcomp. The plugin will wrap cl.exe, to
 locate the proper target compiler, and convert compiler options
-accordingly. The project files require atleast version 0.9.
+accordingly. The project files require at least version 0.9.
 
 Building for AMD64
 ------------------