[Python-checkins] cpython (merge 3.6 -> default): Issue #28300: Merge from 3.6

[berker.peksag]

https://hg.python.org/cpython/rev/b1d2e303570d
changeset:   104129:b1d2e303570d
parent:      104126:cb55aedcc7e8
parent:      104128:078f185f0041
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Wed Sep 28 17:22:51 2016 +0300
summary:
  Issue #28300: Merge from 3.6

files:
  Lib/idlelib/README.txt    |  2 +-
  Lib/test/test_argparse.py |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/idlelib/README.txt b/Lib/idlelib/README.txt
--- a/Lib/idlelib/README.txt
+++ b/Lib/idlelib/README.txt
@@ -16,7 +16,7 @@
 
 
 IDLELIB FILES
-Implemetation files not in IDLE MENU are marked (nim).
+Implementation files not in IDLE MENU are marked (nim).
 Deprecated files and objects are listed separately as the end.
 
 Startup
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -4565,7 +4565,7 @@
         self.assertTrue(ns2 != ns3)
         self.assertTrue(ns2 != ns4)
 
-    def test_equality_returns_notimplemeted(self):
+    def test_equality_returns_notimplemented(self):
         # See issue 21481
         ns = argparse.Namespace(a=1, b=2)
         self.assertIs(ns.__eq__(None), NotImplemented)

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