[Python-checkins] cpython (merge 3.4 -> default): merge

[raymond.hettinger]

http://hg.python.org/cpython/rev/d6e47a24698b
changeset:   90844:d6e47a24698b
parent:      90841:754fcc099834
parent:      90843:510c8dc38749
user:        Raymond Hettinger <python at rcn.com>
date:        Mon May 26 00:44:35 2014 -0700
summary:
  merge

files:
  Lib/argparse.py           |  4 ++++
  Lib/test/test_argparse.py |  6 ++++++
  2 files changed, 10 insertions(+), 0 deletions(-)


diff --git a/Lib/argparse.py b/Lib/argparse.py
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1198,9 +1198,13 @@
             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
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -4551,6 +4551,12 @@
         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

-- 
Repository URL: http://hg.python.org/cpython