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
4f418d36
Commit
4f418d36
authored
Mar 19, 2015
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Plain Diff
Issue #23700: Iterator of NamedTemporaryFile now keeps a reference to
NamedTemporaryFile instance. Patch by Bohuslav Kabrda.
parents
41ce610d
56cefa69
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
1 deletion
+19
-1
Lib/tempfile.py
Lib/tempfile.py
+3
-1
Lib/test/test_tempfile.py
Lib/test/test_tempfile.py
+13
-0
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/tempfile.py
View file @
4f418d36
...
@@ -426,7 +426,9 @@ class _TemporaryFileWrapper:
...
@@ -426,7 +426,9 @@ class _TemporaryFileWrapper:
# iter() doesn't use __getattr__ to find the __iter__ method
# iter() doesn't use __getattr__ to find the __iter__ method
def
__iter__
(
self
):
def
__iter__
(
self
):
return
iter
(
self
.
file
)
# don't return iter(self.file), but yield from it to avoid closing
# file as long as it's being used as iterator, see issue #23000
yield
from
iter
(
self
.
file
)
def
NamedTemporaryFile
(
mode
=
'w+b'
,
buffering
=-
1
,
encoding
=
None
,
def
NamedTemporaryFile
(
mode
=
'w+b'
,
buffering
=-
1
,
encoding
=
None
,
...
...
Lib/test/test_tempfile.py
View file @
4f418d36
...
@@ -707,6 +707,19 @@ class TestNamedTemporaryFile(BaseTestCase):
...
@@ -707,6 +707,19 @@ class TestNamedTemporaryFile(BaseTestCase):
# No reference cycle was created.
# No reference cycle was created.
self
.
assertIsNone
(
wr
())
self
.
assertIsNone
(
wr
())
def
test_iter
(
self
):
# Issue #23700: getting iterator from a temporary file should keep
# it alive as long as it's being iterated over
lines
=
[
b'spam
\
n
'
,
b'eggs
\
n
'
,
b'beans
\
n
'
]
def
make_file
():
f
=
tempfile
.
NamedTemporaryFile
(
mode
=
'w+b'
)
f
.
write
(
b''
.
join
(
lines
))
f
.
seek
(
0
)
return
f
for
i
,
l
in
enumerate
(
make_file
()):
self
.
assertEqual
(
l
,
lines
[
i
])
self
.
assertEqual
(
i
,
len
(
lines
)
-
1
)
def
test_creates_named
(
self
):
def
test_creates_named
(
self
):
# NamedTemporaryFile creates files with names
# NamedTemporaryFile creates files with names
f
=
tempfile
.
NamedTemporaryFile
()
f
=
tempfile
.
NamedTemporaryFile
()
...
...
Misc/NEWS
View file @
4f418d36
...
@@ -18,6 +18,9 @@ Core and Builtins
...
@@ -18,6 +18,9 @@ Core and Builtins
Library
Library
-------
-------
- Issue #23700: Iterator of NamedTemporaryFile now keeps a reference to
NamedTemporaryFile instance. Patch by Bohuslav Kabrda.
- Issue #22903: The fake test case created by unittest.loader when it fails
- Issue #22903: The fake test case created by unittest.loader when it fails
importing a test module is now picklable.
importing a test module is now picklable.
...
...
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