diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2016-09-28 17:22:51 +0300 |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2016-09-28 17:22:51 +0300 |
| commit | 50c972e3c30ac7c89758cb99db62dcf955f06893 (patch) | |
| tree | 4b7edf974a1cab9e06089dc3b596b62c4e71a049 | |
| parent | 5c7c8a342040cf6b985d85a52f90341a044c2077 (diff) | |
| parent | d39370ba41cbc2df84485d5d42833fafa6ad704c (diff) | |
| download | cpython-git-50c972e3c30ac7c89758cb99db62dcf955f06893.tar.gz | |
Issue #28300: Merge from 3.6
| -rw-r--r-- | Lib/idlelib/README.txt | 2 | ||||
| -rw-r--r-- | 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 index 74ec08a082..51e8ef5888 100644 --- a/Lib/idlelib/README.txt +++ b/Lib/idlelib/README.txt @@ -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 diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py index 52c624771c..bc83161630 100644 --- a/Lib/test/test_argparse.py +++ b/Lib/test/test_argparse.py @@ -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) |