[Python-checkins] cpython (merge 3.5 -> 3.6): Issue #28145: Merge spelling fixes from 3.5 into 3.6

[martin.panter]

https://hg.python.org/cpython/rev/87de1f12c41c
changeset:   103853:87de1f12c41c
branch:      3.6
parent:      103848:08a75f380699
parent:      103852:02dd99aeba7d
user:        Martin Panter <vadmium+py at gmail.com>
date:        Fri Sep 16 00:55:27 2016 +0000
summary:
  Issue #28145: Merge spelling fixes from 3.5 into 3.6

files:
  Lib/test/test_defaultdict.py |  2 +-
  Misc/HISTORY                 |  2 +-
  Modules/makesetup            |  2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_defaultdict.py b/Lib/test/test_defaultdict.py
--- a/Lib/test/test_defaultdict.py
+++ b/Lib/test/test_defaultdict.py
@@ -175,7 +175,7 @@
     def test_callable_arg(self):
         self.assertRaises(TypeError, defaultdict, {})
 
-    def test_pickleing(self):
+    def test_pickling(self):
         d = defaultdict(int)
         d[1]
         for proto in range(pickle.HIGHEST_PROTOCOL + 1):
diff --git a/Misc/HISTORY b/Misc/HISTORY
--- a/Misc/HISTORY
+++ b/Misc/HISTORY
@@ -23445,7 +23445,7 @@
 decimal numbers).
 
 - In string.atof(), don't fail when the "re" module is unavailable.
-Plug the ensueing security leak by supplying an empty __builtins__
+Plug the ensuing security leak by supplying an empty __builtins__
 directory to eval().
 
 - A bunch of small fixes and improvements to Tkinter.py.
diff --git a/Modules/makesetup b/Modules/makesetup
--- a/Modules/makesetup
+++ b/Modules/makesetup
@@ -82,7 +82,7 @@
 NL='\
 '
 
-# Setup to link with extra libraries when makeing shared extensions.
+# Setup to link with extra libraries when making shared extensions.
 # Currently, only Cygwin needs this baggage.
 case `uname -s` in
 CYGWIN*) if test $libdir = .

-- 
Repository URL: https://hg.python.org/cpython