Merged revisions 81414 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81414 | benjamin.peterson | 2010-05-21 15:51:45 -0500 (Fri, 21 May 2010) | 1 line
return NotImplemented from Mapping when comparing to a non-mapping #8729
........
diff --git a/Lib/_abcoll.py b/Lib/_abcoll.py
index 82ded37..3743ea8 100644
--- a/Lib/_abcoll.py
+++ b/Lib/_abcoll.py
@@ -369,8 +369,9 @@
__hash__ = None
def __eq__(self, other):
- return isinstance(other, Mapping) and \
- dict(self.items()) == dict(other.items())
+ if not isinstance(other, Mapping):
+ return NotImplemented
+ return dict(self.items()) == dict(other.items())
def __ne__(self, other):
return not (self == other)
diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py
index d1fd60e..f48ae5a 100644
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -1,4 +1,4 @@
-import unittest, doctest
+import unittest, doctest, operator
from test import test_support
from collections import namedtuple
import pickle, cPickle, copy
@@ -232,6 +232,37 @@
self.assertFalse(isinstance(C(), abc))
self.assertFalse(issubclass(C, abc))
+ def validate_comparison(self, instance):
+ ops = ['lt', 'gt', 'le', 'ge', 'ne', 'or', 'and', 'xor', 'sub']
+ operators = {}
+ for op in ops:
+ name = '__' + op + '__'
+ operators[name] = getattr(operator, name)
+
+ class Other:
+ def __init__(self):
+ self.right_side = False
+ def __eq__(self, other):
+ self.right_side = True
+ return True
+ __lt__ = __eq__
+ __gt__ = __eq__
+ __le__ = __eq__
+ __ge__ = __eq__
+ __ne__ = __eq__
+ __ror__ = __eq__
+ __rand__ = __eq__
+ __rxor__ = __eq__
+ __rsub__ = __eq__
+
+ for name, op in operators.items():
+ if not hasattr(instance, name):
+ continue
+ other = Other()
+ op(instance, other)
+ self.assertTrue(other.right_side,'Right side not called for %s.%s'
+ % (type(instance), name))
+
class TestOneTrickPonyABCs(ABCTestCase):
def test_Hashable(self):
@@ -409,6 +440,14 @@
self.failUnless(isinstance(sample(), Set))
self.failUnless(issubclass(sample, Set))
self.validate_abstract_methods(Set, '__contains__', '__iter__', '__len__')
+ class MySet(Set):
+ def __contains__(self, x):
+ return False
+ def __len__(self):
+ return 0
+ def __iter__(self):
+ return iter([])
+ self.validate_comparison(MySet())
def test_hash_Set(self):
class OneTwoThreeSet(Set):
@@ -472,6 +511,14 @@
self.failUnless(issubclass(sample, Mapping))
self.validate_abstract_methods(Mapping, '__contains__', '__iter__', '__len__',
'__getitem__')
+ class MyMapping(collections.Mapping):
+ def __len__(self):
+ return 0
+ def __getitem__(self, i):
+ raise IndexError
+ def __iter__(self):
+ return iter(())
+ self.validate_comparison(MyMapping())
def test_MutableMapping(self):
for sample in [dict]: