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

diff --git a/Lib/_abcoll.py b/Lib/_abcoll.py
index 7890e97473962b1522d9acbbb44871bb03afee36..d3e23c1e446c067f8865b7430dbf60df93c274b6 100644 (file)
--- 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 85bf248a0ca4cd70e543635641c4e2812038ff23..be41fcda0bcde65066b65ac3042aaff33f2a2607 100644 (file)
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -13,7 +13,7 @@ import re
 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
 
@@ -516,6 +516,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.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):
         for sample in [tuple, list, bytes, str]:
             self.assertTrue(isinstance(sample(), Sequence))

diff --git a/Misc/NEWS b/Misc/NEWS
index 9a48c5e185100565fbf8207f25d7cd813a81f963..d88a483756442d541b696c54e5934fc6f1bdf5d6 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -95,6 +95,9 @@ C-API
 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
   ignored by the buffered IO layer anymore.