Commit fdb32c15 authored by Alexander Belopolsky's avatar Alexander Belopolsky

Merged revisions 86857 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86857 | raymond.hettinger | 2010-11-28 22:56:12 -0500 (Sun, 28 Nov 2010) | 1 line

  Issue #10565:  Iterator ABC should require both __next__ and __iter__.
........
parent 34cc2025
......@@ -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
......
......@@ -328,7 +328,14 @@ class TestOneTrickPonyABCs(ABCTestCase):
for x in samples:
self.assertTrue(isinstance(x, Iterator), repr(x))
self.assertTrue(issubclass(type(x), Iterator), repr(type(x)))
self.validate_abstract_methods(Iterator, '__next__')
self.validate_abstract_methods(Iterator, '__next__', '__iter__')
# Issue 10565
class NextOnly:
def __next__(self):
yield 1
raise StopIteration
self.assertFalse(isinstance(NextOnly(), Iterator))
def test_Sized(self):
non_samples = [None, 42, 3.14, 1j,
......
......@@ -28,6 +28,9 @@ Core and Builtins
Library
-------
- Issue #10565: The collections.Iterator ABC now checks for both
__iter__ and __next__.
- Issue #10561: In pdb, clear the breakpoints by the breakpoint number.
- Issue #10459: Update CJK character names to Unicode 5.1.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment