summaryrefslogtreecommitdiff
path: root/Lib
diff options
context:
space:
mode:
authorRaymond Hettinger <rhettinger@users.noreply.github.com>2018-01-11 21:53:49 -0800
committerGitHub <noreply@github.com>2018-01-11 21:53:49 -0800
commit02556fbade5e1e864dd09d5768a8dbbf5b3a0dac (patch)
tree14aa995e97221042d271e1c431397e7bb9dee2b0 /Lib
parentbpo-31113: Get rid of recursion in the compiler for normal control flow. (#3015) (diff)
downloadcpython-02556fbade5e1e864dd09d5768a8dbbf5b3a0dac.tar.gz
cpython-02556fbade5e1e864dd09d5768a8dbbf5b3a0dac.tar.bz2
cpython-02556fbade5e1e864dd09d5768a8dbbf5b3a0dac.zip
bpo-32467: Let collections.abc.ValuesView inherit from Collection (#5152)
Diffstat (limited to 'Lib')
-rw-r--r--Lib/_collections_abc.py2
-rw-r--r--Lib/test/test_collections.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/_collections_abc.py b/Lib/_collections_abc.py
index a5c7bfcda1d..dbe30dff1fe 100644
--- a/Lib/_collections_abc.py
+++ b/Lib/_collections_abc.py
@@ -746,7 +746,7 @@ class ItemsView(MappingView, Set):
ItemsView.register(dict_items)
-class ValuesView(MappingView):
+class ValuesView(MappingView, Collection):
__slots__ = ()
diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py
index cb662355bb7..a55239e5730 100644
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -843,13 +843,13 @@ class TestOneTrickPonyABCs(ABCTestCase):
self.assertFalse(issubclass(type(x), Collection), repr(type(x)))
# Check some non-collection iterables
non_col_iterables = [_test_gen(), iter(b''), iter(bytearray()),
- (x for x in []), dict().values()]
+ (x for x in [])]
for x in non_col_iterables:
self.assertNotIsInstance(x, Collection)
self.assertFalse(issubclass(type(x), Collection), repr(type(x)))
# Check some collections
samples = [set(), frozenset(), dict(), bytes(), str(), tuple(),
- list(), dict().keys(), dict().items()]
+ list(), dict().keys(), dict().items(), dict().values()]
for x in samples:
self.assertIsInstance(x, Collection)
self.assertTrue(issubclass(type(x), Collection), repr(type(x)))