diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-09-16 00:55:27 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-09-16 00:55:27 (GMT) |
| commit | 355bbb0a2ae864acd6c719b3529c6f5cabfdd950 (patch) | |
| tree | 119bcaa76ccafcb2193765d043ae8479dd7b4462 | |
| parent | 993b6f5c7ba072ca58398500570da6e16489f277 (diff) | |
| parent | 2dc77f0e197b9ca9710d7ae20ff13fe2bea541c4 (diff) | |
| download | cpython-355bbb0a2ae864acd6c719b3529c6f5cabfdd950.zip cpython-355bbb0a2ae864acd6c719b3529c6f5cabfdd950.tar.gz cpython-355bbb0a2ae864acd6c719b3529c6f5cabfdd950.tar.bz2 | |
Issue #28145: Merge spelling fixes from 3.5 into 3.6
| -rw-r--r-- | Lib/test/test_defaultdict.py | 2 | ||||
| -rw-r--r-- | Misc/HISTORY | 2 | ||||
| -rwxr-xr-x | Modules/makesetup | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/test_defaultdict.py b/Lib/test/test_defaultdict.py index a90bc2b..7218349 100644 --- a/Lib/test/test_defaultdict.py +++ b/Lib/test/test_defaultdict.py @@ -175,7 +175,7 @@ class TestDefaultDict(unittest.TestCase): 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 index 73fb1d3..fa2e3c7 100644 --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -23445,7 +23445,7 @@ uudecode bug where it complaints about trailing garbage is still there 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 index 90db42e..3297b78 100755 --- a/Modules/makesetup +++ b/Modules/makesetup @@ -82,7 +82,7 @@ esac 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 = . |