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
f6b361ec
Commit
f6b361ec
authored
Feb 13, 2013
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #16800: tempfile.gettempdir() no longer left temporary files when
the disk is full. Original patch by Amir Szekely.
parent
e4ad8aac
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
56 additions
and
7 deletions
+56
-7
Lib/tempfile.py
Lib/tempfile.py
+8
-5
Lib/test/test_tempfile.py
Lib/test/test_tempfile.py
+44
-2
Misc/ACKS
Misc/ACKS
+1
-0
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/tempfile.py
View file @
f6b361ec
...
...
@@ -175,11 +175,14 @@ def _get_default_tempdir():
filename
=
_os
.
path
.
join
(
dir
,
name
)
try
:
fd
=
_os
.
open
(
filename
,
_bin_openflags
,
0o600
)
fp
=
_io
.
open
(
fd
,
'wb'
)
fp
.
write
(
b'blat'
)
fp
.
close
()
_os
.
unlink
(
filename
)
del
fp
,
fd
try
:
try
:
fp
=
_io
.
open
(
fd
,
'wb'
,
buffering
=
0
,
closefd
=
False
)
fp
.
write
(
b'blat'
)
finally
:
_os
.
close
(
fd
)
finally
:
_os
.
unlink
(
filename
)
return
dir
except
(
OSError
,
IOError
)
as
e
:
if
e
.
args
[
0
]
!=
_errno
.
EEXIST
:
...
...
Lib/test/test_tempfile.py
View file @
f6b361ec
# tempfile.py unit tests.
import
tempfile
import
errno
import
io
import
os
import
signal
import
sys
...
...
@@ -211,8 +213,48 @@ class test__candidate_tempdir_list(TC):
test_classes
.
append
(
test__candidate_tempdir_list
)
# We test _get_default_tempdir by testing gettempdir.
# We test _get_default_tempdir some more by testing gettempdir.
class
TestGetDefaultTempdir
(
TC
):
"""Test _get_default_tempdir()."""
def
test_no_files_left_behind
(
self
):
# use a private empty directory
with
tempfile
.
TemporaryDirectory
()
as
our_temp_directory
:
# force _get_default_tempdir() to consider our empty directory
def
our_candidate_list
():
return
[
our_temp_directory
]
with
support
.
swap_attr
(
tempfile
,
"_candidate_tempdir_list"
,
our_candidate_list
):
# verify our directory is empty after _get_default_tempdir()
tempfile
.
_get_default_tempdir
()
self
.
assertEqual
(
os
.
listdir
(
our_temp_directory
),
[])
def
raise_OSError
(
*
args
,
**
kwargs
):
raise
OSError
(
-
1
)
with
support
.
swap_attr
(
io
,
"open"
,
raise_OSError
):
# test again with failing io.open()
with
self
.
assertRaises
(
IOError
)
as
cm
:
tempfile
.
_get_default_tempdir
()
self
.
assertEqual
(
cm
.
exception
.
args
[
0
],
errno
.
ENOENT
)
self
.
assertEqual
(
os
.
listdir
(
our_temp_directory
),
[])
open
=
io
.
open
def
bad_writer
(
*
args
,
**
kwargs
):
fp
=
open
(
*
args
,
**
kwargs
)
fp
.
write
=
raise_OSError
return
fp
with
support
.
swap_attr
(
io
,
"open"
,
bad_writer
):
# test again with failing write()
with
self
.
assertRaises
(
IOError
)
as
cm
:
tempfile
.
_get_default_tempdir
()
self
.
assertEqual
(
cm
.
exception
.
errno
,
errno
.
ENOENT
)
self
.
assertEqual
(
os
.
listdir
(
our_temp_directory
),
[])
test_classes
.
append
(
TestGetDefaultTempdir
)
class
test__get_candidate_names
(
TC
):
...
...
Misc/ACKS
View file @
f6b361ec
...
...
@@ -1051,6 +1051,7 @@ Andrew Svetlov
Paul Swartz
Thenault Sylvain
Péter Szabó
Amir Szekely
Arfrever Frehtes Taifersar Arahesis
Neil Tallim
Geoff Talvola
...
...
Misc/NEWS
View file @
f6b361ec
...
...
@@ -221,6 +221,9 @@ Core and Builtins
Library
-------
- Issue #16800: tempfile.gettempdir() no longer left temporary files when
the disk is full. Original patch by Amir Szekely.
- Issue #16564: Fixed regression relative to Python2 in the operation of
email.encoders.encode_7or8bit when used with binary data.
...
...
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