changeset:   100474:88d6742aa99a
branch:      2.7
parent:      100471:bd4332658581
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Tue Mar 08 23:34:28 2016 +0200
files:       Lib/fileinput.py
description:
Issue #15068: Avoid creating a reference loop in fileinput.


diff -r bd4332658581 -r 88d6742aa99a Lib/fileinput.py
--- a/Lib/fileinput.py	Tue Mar 08 13:09:32 2016 -0800
+++ b/Lib/fileinput.py	Tue Mar 08 23:34:28 2016 +0200
@@ -207,7 +207,6 @@
         self._startlineno = 0
         self._filelineno = 0
         self._file = None
-        self._readline = self._start_readline
         self._isstdin = False
         self._backupfilename = None
         # restrict mode argument to reading modes
@@ -234,15 +233,15 @@
         return self
 
     def next(self):
-        line = self._readline()
-        if line:
-            self._filelineno += 1
-            return line
-        if not self._file:
-            raise StopIteration
-        self.nextfile()
-        # Recursive call
-        return self.next()
+        while 1:
+            line = self._readline()
+            if line:
+                self._filelineno += 1
+                return line
+            if not self._file:
+                raise StopIteration
+            self.nextfile()
+            # repeat with next file
 
     def __getitem__(self, i):
         if i != self.lineno():
@@ -266,7 +265,10 @@
         finally:
             file = self._file
             self._file = None
-            self._readline = self._start_readline
+            try:
+                del self._readline  # restore FileInput._readline
+            except AttributeError:
+                pass
             try:
                 if file and not self._isstdin:
                     file.close()
@@ -290,7 +292,7 @@
             self.nextfile()
             # repeat with next file
 
-    def _start_readline(self):
+    def _readline(self):
         if not self._files:
             return ""
         self._filename = self._files[0]
@@ -336,7 +338,7 @@
                 else:
                     self._file = open(self._filename, self._mode)
 
-        self._readline = self._file.readline
+        self._readline = self._file.readline  # hide FileInput._readline
         return self._readline()
 
     def filename(self):