From: Martin Panter <vadmium+py@gmail.com>
Date: Mon, 10 Oct 2016 01:00:00 +0000 (+0000)
Subject: Issue #28394: Typo fixes in code comments and changelog
X-Git-Tag: v2.7.13rc1~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=829d4fbbf93a25424ec007808617d87deb63eec9;p=python

Issue #28394: Typo fixes in code comments and changelog

Includes patch by Ville Skyttä.
---

diff --git a/Lib/lib2to3/Grammar.txt b/Lib/lib2to3/Grammar.txt
index e151bac33e..9be7c9f057 100644
--- a/Lib/lib2to3/Grammar.txt
+++ b/Lib/lib2to3/Grammar.txt
@@ -150,7 +150,7 @@ arglist: argument (',' argument)* [',']
 # to our LL(1) parser. Even though 'test' includes '*expr' in star_expr,
 # we explicitly match '*' here, too, to give it proper precedence.
 # Illegal combinations and orderings are blocked in ast.c:
-# multiple (test comp_for) arguements are blocked; keyword unpackings
+# multiple (test comp_for) arguments are blocked; keyword unpackings
 # that precede iterable unpackings are blocked; etc.
 argument: ( test [comp_for] |
             test '=' test |
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index db9b1fe201..7e8b058e8b 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -738,7 +738,7 @@ class SourceAddressTest(TestServerMixin, TestCase):
     def testHTTPSConnectionSourceAddress(self):
         self.conn = httplib.HTTPSConnection(HOST, self.port,
                 source_address=('', self.source_port))
-        # We don't test anything here other the constructor not barfing as
+        # We don't test anything here other than the constructor not barfing as
         # this code doesn't deal with setting up an active running SSL server
         # for an ssl_wrapped connect() to actually return from.
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 872e013fb1..d8771466df 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -25,7 +25,7 @@ Core and Builtins
 
 - Issue #15578: Correctly incref the parent module while importing.
 
-- Issue #26307: The profile-opt build now applys PGO to the built-in modules.
+- Issue #26307: The profile-opt build now applies PGO to the built-in modules.
 
 - Issue #26020: set literal evaluation order did not match documented behaviour.
 
@@ -488,7 +488,7 @@ Library
 - Issue #26385: Remove the file if the internal fdopen() call in
   NamedTemporaryFile() fails.  Based on patch by Silent Ghost.
 
-- Issue #26309: In the "socketserver" module, shut down the request (closing
+- Issue #26309: In the "SocketServer" module, shut down the request (closing
   the connected socket) when verify_request() returns false.  Based on patch
   by Aviv Palivoda.
 
@@ -6537,7 +6537,7 @@ Library
 - Issue #8140: Extend compileall to compile single files.  Add -i option.
 
 - Issue #7774: Set sys.executable to an empty string if ``argv[0]`` has been set
-  to an non existent program name and Python is unable to retrieve the real
+  to a non existent program name and Python is unable to retrieve the real
   program name.
 
 - Issue #8117: logging: Improved algorithm for computing initial rollover time
@@ -8053,7 +8053,7 @@ Library
   is used.  Original patch by Floris Bruynooghe.
 
 - Issue #5941: Distutils build_clib command was not working anymore because of
-  an incomplete costumization of the archiver command.  Added ARFLAGS in the
+  an incomplete customization of the archiver command.  Added ARFLAGS in the
   Makefile besides AR and make Distutils use it.  Original patch by David
   Cournapeau.