summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2014-05-26 07:43:27 (GMT)
committerRaymond Hettinger <python@rcn.com>2014-05-26 07:43:27 (GMT)
commitdea46ec9654a6412e74a6f8dfbdf97ff97516670 (patch)
tree6e157f543c738ecdf463a53afde142cb007a660e
parentdd5e53a086fcabc84ee1ac96b98057437863973a (diff)
downloadcpython-dea46ec9654a6412e74a6f8dfbdf97ff97516670.zip
cpython-dea46ec9654a6412e74a6f8dfbdf97ff97516670.tar.gz
cpython-dea46ec9654a6412e74a6f8dfbdf97ff97516670.tar.bz2
Issue #21481: Teach argparse equality tests to return NotImplemented when comparing to unknown types.
-rw-r--r--Lib/argparse.py4
-rw-r--r--Lib/test/test_argparse.py6
-rw-r--r--Misc/NEWS3
3 files changed, 13 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
diff --git a/Misc/NEWS b/Misc/NEWS
index cdce6f0..13ff667 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -24,6 +24,9 @@ Library
- Issue #14710: pkgutil.find_loader() no longer raises an exception when a
module doesn't exist.
+- Issue #21481: Argparse equality and inequality tests now return
+ NotImplemented when comparing to an unknown type.
+
- Issue #8743: Fix interoperability between set objects and the
collections.Set() abstract base class.