merge

rhettinger · rhettinger · commit 79cae680a3c8 · 2014-05-26T00:44:35.000-07:00
diff --git a/Lib/argparse.py b/Lib/argparse.py
@@ -1198,9 +1198,13 @@ def __init__(self, **kwargs):
             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
@@ -4551,6 +4551,12 @@ def test_equality(self):
         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
