Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
67ce0ddd
Commit
67ce0ddd
authored
Mar 08, 2016
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Plain Diff
Issue #15068: Avoid creating a reference loop in fileinput.
parents
51f14c48
ebe3430c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
13 deletions
+15
-13
Lib/fileinput.py
Lib/fileinput.py
+15
-13
No files found.
Lib/fileinput.py
View file @
67ce0ddd
...
...
@@ -209,7 +209,6 @@ class FileInput:
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
...
...
@@ -247,15 +246,15 @@ class FileInput:
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
True
:
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
():
...
...
@@ -279,7 +278,10 @@ class FileInput:
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
()
...
...
@@ -303,7 +305,7 @@ class FileInput:
self
.
nextfile
()
# repeat with next file
def
_
start_
readline
(
self
):
def
_readline
(
self
):
if
not
self
.
_files
:
if
'b'
in
self
.
_mode
:
return
b''
...
...
@@ -358,7 +360,7 @@ class FileInput:
self
.
_file
=
self
.
_openhook
(
self
.
_filename
,
self
.
_mode
)
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
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment