diff options
| -rw-r--r-- | Lib/_abcoll.py | 8 | ||||
| -rw-r--r-- | Lib/test/test_collections.py | 27 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 37 insertions, 1 deletions
diff --git a/Lib/_abcoll.py b/Lib/_abcoll.py index 7890e97..d3e23c1 100644 --- a/Lib/_abcoll.py +++ b/Lib/_abcoll.py @@ -393,6 +393,10 @@ class MappingView(Sized): class KeysView(MappingView, Set): + @classmethod + def _from_iterable(self, it): + return set(it) + def __contains__(self, key): return key in self._mapping @@ -405,6 +409,10 @@ KeysView.register(dict_keys) class ItemsView(MappingView, Set): + @classmethod + def _from_iterable(self, it): + return set(it) + def __contains__(self, item): key, value = item try: diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py index 2af94bf..da80baa 100644 --- a/Lib/test/test_collections.py +++ b/Lib/test/test_collections.py @@ -13,7 +13,7 @@ import sys from collections import Hashable, Iterable, Iterator from collections import Sized, Container, Callable from collections import Set, MutableSet -from collections import Mapping, MutableMapping +from collections import Mapping, MutableMapping, KeysView, ItemsView, UserDict from collections import Sequence, MutableSequence from collections import ByteString @@ -548,6 +548,31 @@ class TestCollectionABCs(ABCTestCase): self.validate_abstract_methods(MutableMapping, '__contains__', '__iter__', '__len__', '__getitem__', '__setitem__', '__delitem__') + def test_MutableMapping_subclass(self): + # Test issue 9214 + mymap = UserDict() + mymap['red'] = 5 + self.assertIsInstance(mymap.keys(), Set) + self.assertIsInstance(mymap.keys(), KeysView) + self.assertIsInstance(mymap.items(), Set) + self.assertIsInstance(mymap.items(), ItemsView) + + mymap = UserDict() + mymap['red'] = 5 + z = mymap.keys() | {'orange'} + self.assertIsInstance(z, set) + list(z) + mymap['blue'] = 7 # Shouldn't affect 'z' + self.assertEqual(sorted(z), ['orange', 'red']) + + mymap = UserDict() + mymap['red'] = 5 + z = mymap.items() | {('orange', 3)} + self.assertIsInstance(z, set) + list(z) + mymap['blue'] = 7 # Shouldn't affect 'z' + self.assertEqual(sorted(z), [('orange', 3), ('red', 5)]) + def test_Sequence(self): for sample in [tuple, list, bytes, str]: self.assertIsInstance(sample(), Sequence) @@ -66,6 +66,9 @@ Core and Builtins Extensions ---------- +- Issue #9214: Set operations on a KeysView or ItemsView in collections + now correctly return a set. (Patch by Eli Bendersky.) + - Issue #5737: Add Solaris-specific mnemonics in the errno module. Patch by Matthew Ahrens. |