Issue #9214: Fix set operations on KeysView and ItemsView.

This commit is contained in:
Raymond Hettinger 2010-08-22 07:56:20 +00:00
parent d5c190d208
commit 0e708a1b79
3 changed files with 37 additions and 1 deletions

View File

@ -393,6 +393,10 @@ class MappingView(Sized):
class KeysView(MappingView, Set): class KeysView(MappingView, Set):
@classmethod
def _from_iterable(self, it):
return set(it)
def __contains__(self, key): def __contains__(self, key):
return key in self._mapping return key in self._mapping
@ -405,6 +409,10 @@ KeysView.register(dict_keys)
class ItemsView(MappingView, Set): class ItemsView(MappingView, Set):
@classmethod
def _from_iterable(self, it):
return set(it)
def __contains__(self, item): def __contains__(self, item):
key, value = item key, value = item
try: try:

View File

@ -13,7 +13,7 @@ import re
from collections import Hashable, Iterable, Iterator from collections import Hashable, Iterable, Iterator
from collections import Sized, Container, Callable from collections import Sized, Container, Callable
from collections import Set, MutableSet 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 Sequence, MutableSequence
from collections import ByteString from collections import ByteString
@ -516,6 +516,31 @@ class TestCollectionABCs(ABCTestCase):
self.validate_abstract_methods(MutableMapping, '__contains__', '__iter__', '__len__', self.validate_abstract_methods(MutableMapping, '__contains__', '__iter__', '__len__',
'__getitem__', '__setitem__', '__delitem__') '__getitem__', '__setitem__', '__delitem__')
def test_MutableMapping_subclass(self):
# Test issue 9214
mymap = UserDict()
mymap['red'] = 5
self.assert_(isinstance(mymap.keys(), Set))
self.assert_(isinstance(mymap.keys(), KeysView))
self.assert_(isinstance(mymap.items(), Set))
self.assert_(isinstance(mymap.items(), ItemsView))
mymap = UserDict()
mymap['red'] = 5
z = mymap.keys() | {'orange'}
self.assertEqual(type(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.assertEqual(type(z), set)
list(z)
mymap['blue'] = 7 # Shouldn't affect 'z'
self.assertEqual(sorted(z), [('orange', 3), ('red', 5)])
def test_Sequence(self): def test_Sequence(self):
for sample in [tuple, list, bytes, str]: for sample in [tuple, list, bytes, str]:
self.assertTrue(isinstance(sample(), Sequence)) self.assertTrue(isinstance(sample(), Sequence))

View File

@ -95,6 +95,9 @@ C-API
Library Library
------- -------
- Issue #9214: Set operations on KeysView or ItemsView in the collections
module now correctly return a set. (Patch by Eli Bendersky.)
- Issue #9617: Signals received during a low-level write operation aren't - Issue #9617: Signals received during a low-level write operation aren't
ignored by the buffered IO layer anymore. ignored by the buffered IO layer anymore.