diff options
| author | Raymond Hettinger <python@rcn.com> | 2014-05-26 07:44:35 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2014-05-26 07:44:35 (GMT) |
| commit | 79cae680a3c84477fdcadeed14f8392842d93c01 (patch) | |
| tree | 208da89811792eb440f9914fc2cdf77fca43a5a6 /Lib | |
| parent | aa92d342f1249d3f8b5b7ca28a6efe43dd7e1eb5 (diff) | |
| parent | dea46ec9654a6412e74a6f8dfbdf97ff97516670 (diff) | |
| download | cpython-79cae680a3c84477fdcadeed14f8392842d93c01.zip cpython-79cae680a3c84477fdcadeed14f8392842d93c01.tar.gz cpython-79cae680a3c84477fdcadeed14f8392842d93c01.tar.bz2 | |
merge
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/argparse.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_argparse.py | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Lib/argparse.py b/Lib/argparse.py index 5ad7e13..83878b1 100644 --- a/Lib/argparse.py +++ b/Lib/argparse.py @@ -1198,9 +1198,13 @@ class Namespace(_AttributeHolder): setattr(self, name, kwargs[name]) def __eq__(self, other): + if not isinstance(other, Namespace): + return NotImplemented return vars(self) == vars(other) def __ne__(self, other): + if not isinstance(other, Namespace): + return NotImplemented return not (self == other) def __contains__(self, key): diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py index 5c77ec8..8a4fdb9 100644 --- a/Lib/test/test_argparse.py +++ b/Lib/test/test_argparse.py @@ -4551,6 +4551,12 @@ class TestNamespace(TestCase): self.assertTrue(ns2 != ns3) self.assertTrue(ns2 != ns4) + def test_equality_returns_notimplemeted(self): + # See issue 21481 + ns = argparse.Namespace(a=1, b=2) + self.assertIs(ns.__eq__(None), NotImplemented) + self.assertIs(ns.__ne__(None), NotImplemented) + # =================== # File encoding tests |