diff -r aaf2ad84ae1c Lib/_collections_abc.py --- a/Lib/_collections_abc.py Thu Apr 28 14:47:33 2016 -0500 +++ b/Lib/_collections_abc.py Tue May 03 14:19:50 2016 +0800 @@ -689,7 +689,7 @@ except KeyError: return False else: - return v == value + return v is value or v == value def __iter__(self): for key in self._mapping: @@ -704,7 +704,8 @@ def __contains__(self, value): for key in self._mapping: - if value == self._mapping[key]: + v = self._mapping[key] + if v is value or v == value: return True return False @@ -839,7 +840,7 @@ def __contains__(self, value): for v in self: - if v == value: + if v is value or v == value: return True return False diff -r aaf2ad84ae1c Lib/test/test_collections.py --- a/Lib/test/test_collections.py Thu Apr 28 14:47:33 2016 -0500 +++ b/Lib/test/test_collections.py Tue May 03 14:19:50 2016 +0800 @@ -23,7 +23,7 @@ from collections.abc import Hashable, Iterable, Iterator, Generator, Reversible from collections.abc import Sized, Container, Callable from collections.abc import Set, MutableSet -from collections.abc import Mapping, MutableMapping, KeysView, ItemsView +from collections.abc import Mapping, MutableMapping, KeysView, ItemsView, ValuesView from collections.abc import Sequence, MutableSequence from collections.abc import ByteString @@ -1074,6 +1074,26 @@ self.assertFalse(ncs > cs) self.assertTrue(ncs >= cs) + def test_issue(self): + # Container membership test should check identity first + class CustomEqualObject: + def __eq__(self, other): + return False + class CustomSequence(list): + def __contains__(self, value): + return Sequence.__contains__(self, value) + + nan = float('nan') + obj = CustomEqualObject() + containers = [ + CustomSequence([nan, obj]), + ItemsView({1: nan, 2: obj}), + ValuesView({1: nan, 2: obj}) + ] + for container in containers: + for elem in container: + self.assertIn(elem, container) + def assertSameSet(self, s1, s2): # coerce both to a real set then check equality self.assertSetEqual(set(s1), set(s2))