Issue #28300: Merge from 3.6

This commit is contained in:
Berker Peksag 2016-09-28 17:22:51 +03:00
commit 50c972e3c3
2 changed files with 2 additions and 2 deletions

View File

@ -16,7 +16,7 @@ and omissions and lag behind changes in idlelib.
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

View File

@ -4565,7 +4565,7 @@ class TestNamespace(TestCase):
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)