[Python-checkins] r86872 - in python/branches/release31-maint: Lib/_abcoll.py Lib/test/test_collections.py Misc/NEWS

[alexander.belopolsky]

Author: alexander.belopolsky
Date: Tue Nov 30 02:01:02 2010
New Revision: 86872

Log:
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__.
........


Modified:
   python/branches/release31-maint/Lib/_abcoll.py
   python/branches/release31-maint/Lib/test/test_collections.py
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Lib/_abcoll.py
==============================================================================
--- python/branches/release31-maint/Lib/_abcoll.py	(original)
+++ python/branches/release31-maint/Lib/_abcoll.py	Tue Nov 30 02:01:02 2010
@@ -90,7 +90,8 @@
     @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
 

Modified: python/branches/release31-maint/Lib/test/test_collections.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_collections.py	(original)
+++ python/branches/release31-maint/Lib/test/test_collections.py	Tue Nov 30 02:01:02 2010
@@ -328,7 +328,14 @@
         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,

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Tue Nov 30 02:01:02 2010
@@ -28,6 +28,9 @@
 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.