#18466: merge with 3.3.

6 files changed, 6 insertions, 6 deletions

diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py
index e1a075c..0f19f30 100644
--- a/Lib/collections/__init__.py
+++ b/Lib/collections/__init__.py
@@ -372,7 +372,7 @@ def namedtuple(typename, field_names, verbose=False, rename=False):
         print(result._source)
 
     # 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/datetimetester.py b/Lib/test/datetimetester.py
index e08b2dc..49140a5 100644
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -250,7 +250,7 @@ class TestTimeZone(unittest.TestCase):
                              t.replace(tzinfo=tz).dst())
 
 #############################################################################
-# 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_ast.py b/Lib/test/test_ast.py
index 49daacb..e69422a 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -22,7 +22,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_http_cookiejar.py b/Lib/test/test_http_cookiejar.py
index 5575bff..143ac8a 100644
--- a/Lib/test/test_http_cookiejar.py
+++ b/Lib/test/test_http_cookiejar.py
@@ -374,7 +374,7 @@ class CookieTests(unittest.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_normalization.py b/Lib/test/test_normalization.py
index db28e1a..ab2eeb7 100644
--- a/Lib/test/test_normalization.py
+++ b/Lib/test/test_normalization.py
@@ -59,7 +59,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 b4b56d6..94f640b 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -1294,7 +1294,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):