diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-05-21 20:55:22 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-05-21 20:55:22 (GMT) |
| commit | 4ad6bd5482514631680cebea3cdf06c56b87bac8 (patch) | |
| tree | 4191a9e7194e05795cc71e9e34e64c88c3c40f24 /Lib/_abcoll.py | |
| parent | 471ed00ae9ccccd2c040b79df04092f0b255f8d7 (diff) | |
| download | cpython-4ad6bd5482514631680cebea3cdf06c56b87bac8.zip cpython-4ad6bd5482514631680cebea3cdf06c56b87bac8.tar.gz cpython-4ad6bd5482514631680cebea3cdf06c56b87bac8.tar.bz2 | |
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
........
Diffstat (limited to 'Lib/_abcoll.py')
| -rw-r--r-- | Lib/_abcoll.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/_abcoll.py b/Lib/_abcoll.py index a60d91e..e9f06a5 100644 --- a/Lib/_abcoll.py +++ b/Lib/_abcoll.py @@ -376,8 +376,9 @@ class Mapping(Sized, Iterable, Container): return ValuesView(self) 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) |