From: Raymond Hettinger <python@rcn.com>
Date: Mon, 29 Nov 2010 03:56:12 +0000 (+0000)
Subject: Issue #10565:  Iterator ABC should require both __next__ and __iter__.
X-Git-Tag: v3.2b1~180
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ead22227cce112457b6beba8b008699ea4a3a084;p=thirdparty%2FPython%2Fcpython.git

Issue #10565:  Iterator ABC should require both __next__ and __iter__.
---

diff --git a/Lib/_abcoll.py b/Lib/_abcoll.py
index cac06e0825f4..0957553613b7 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 f3f8b0315610..02b9dc31cea8 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,
diff --git a/Misc/NEWS b/Misc/NEWS
index 27c733166c9c..79171a53978b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -43,6 +43,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #10565: The collections.Iterator ABC now checks for both
+  __iter__ and __next__.
+
 - Issue #10242: Fixed implementation of unittest.ItemsEqual and gave it
   a new more informative name, unittest.CountEqual.