mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #15068: Avoid creating a reference loop in fileinput.

Browse source
This commit is contained in:
Serhiy Storchaka 2016-03-08 23:35:35 +02:00
parent 4a6f4825f4
commit 0554d83f0f
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/fileinput.py
View file

@ -207,7 +207,6 @@ class FileInput:
self._startlineno = 0 self._startlineno = 0
self._filelineno = 0 self._filelineno = 0
self._file = None self._file = None
self._readline = self._start_readline
self._isstdin = False self._isstdin = False
self._backupfilename = None self._backupfilename = None
# restrict mode argument to reading modes # restrict mode argument to reading modes
@ -245,6 +244,7 @@ class FileInput:
return self return self
def __next__(self): def __next__(self):
while True:
line = self._readline() line = self._readline()
if line: if line:
self._filelineno += 1 self._filelineno += 1
@ -252,8 +252,7 @@ class FileInput:
if not self._file: if not self._file:
raise StopIteration raise StopIteration
self.nextfile() self.nextfile()
# Recursive call # repeat with next file
return self.__next__()
def __getitem__(self, i): def __getitem__(self, i):
if i != self.lineno(): if i != self.lineno():
@ -277,7 +276,10 @@ class FileInput:
finally: finally:
file = self._file file = self._file
self._file = None self._file = None
self._readline = self._start_readline try:
del self._readline # restore FileInput._readline
except AttributeError:
pass
try: try:
if file and not self._isstdin: if file and not self._isstdin:
file.close() file.close()
@ -301,7 +303,7 @@ class FileInput:
self.nextfile() self.nextfile()
# repeat with next file # repeat with next file
def _start_readline(self): def _readline(self):
if not self._files: if not self._files:
if 'b' in self._mode: if 'b' in self._mode:
return b'' return b''
@ -356,7 +358,7 @@ class FileInput:
self._file = self._openhook(self._filename, self._mode) self._file = self._openhook(self._filename, self._mode)
else: else:
self._file = open(self._filename, self._mode) self._file = open(self._filename, self._mode)
self._readline = self._file.readline self._readline = self._file.readline # hide FileInput._readline
return self._readline() return self._readline()
def filename(self): def filename(self):