diff options
author | Raymond Hettinger <python@rcn.com> | 2010-11-29 03:56:12 (GMT) |
---|---|---|
committer | Raymond Hettinger <python@rcn.com> | 2010-11-29 03:56:12 (GMT) |
commit | ead22227cce112457b6beba8b008699ea4a3a084 (patch) | |
tree | 9dcc912a990ce6e6730f52e71d431ac489eb7b70 /Lib | |
parent | 263cbdfdfb0a7fe13f04c1b3188968d7a39d7d09 (diff) | |
download | cpython-ead22227cce112457b6beba8b008699ea4a3a084.zip cpython-ead22227cce112457b6beba8b008699ea4a3a084.tar.gz cpython-ead22227cce112457b6beba8b008699ea4a3a084.tar.bz2 |
Issue #10565: Iterator ABC should require both __next__ and __iter__.
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/_abcoll.py | 3 | ||||
-rw-r--r-- | Lib/test/test_collections.py | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/Lib/_abcoll.py b/Lib/_abcoll.py index cac06e0..0957553 100644 --- a/Lib/_abcoll.py +++ b/Lib/_abcoll.py @@ -90,7 +90,8 @@ class Iterator(Iterable): @classmethod def __subclasshook__(cls, C): if cls is Iterator: - if any("__next__" in B.__dict__ for B in C.__mro__): + if (any("__next__" in B.__dict__ for B in C.__mro__) and + any("__iter__" in B.__dict__ for B in C.__mro__)): return True return NotImplemented diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py index f3f8b03..02b9dc3 100644 --- a/Lib/test/test_collections.py +++ b/Lib/test/test_collections.py @@ -356,8 +356,14 @@ class TestOneTrickPonyABCs(ABCTestCase): for x in samples: self.assertIsInstance(x, Iterator) self.assertTrue(issubclass(type(x), Iterator), repr(type(x))) - self.validate_abstract_methods(Iterator, '__next__') - self.validate_isinstance(Iterator, '__next__') + self.validate_abstract_methods(Iterator, '__next__', '__iter__') + + # Issue 10565 + class NextOnly: + def __next__(self): + yield 1 + raise StopIteration + self.assertNotIsInstance(NextOnly(), Iterator) def test_Sized(self): non_samples = [None, 42, 3.14, 1j, |