From 8e13de6725943ce7e80bf96bc5f6bd330be428a7 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Fri, 21 May 2010 21:05:45 +0000 Subject: Merged revisions 81417 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r81417 | benjamin.peterson | 2010-05-21 15:55:22 -0500 (Fri, 21 May 2010) | 9 lines 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 ........ ................ --- Lib/_abcoll.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Lib/_abcoll.py') diff --git a/Lib/_abcoll.py b/Lib/_abcoll.py index a60d91e7cb..e9f06a5ed3 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) -- cgit v1.2.1