Make StringIO its own iterator, similar to real files.

(This should also be done to cStringIO.)

diff --git a/Lib/StringIO.py b/Lib/StringIO.py
index 79ab7e16b3291c35da4f4cecffa9c6b03fa542da..89dda5e95d118d5ab737b7da8e2da6a0baa53405 100644 (file)
--- a/Lib/StringIO.py
+++ b/Lib/StringIO.py
@@ -59,7 +59,15 @@ class StringIO:
         self.softspace = 0
 
     def __iter__(self):
-        return iter(self.readline, '')
+        return self
+
+    def next(self):
+        if self.closed:
+            raise StopIteration
+        r = self.readline()
+        if not r:
+            raise StopIteration
+        return r
 
     def close(self):
         """Free the memory buffer.