Issue #18849: Fixed a Windows-specific tempfile bug where collision with an

existing directory caused mkstemp and related APIs to fail instead of
retrying. Report and fix by Vlad Shcherbina.
This commit is contained in:
Eli Bendersky 2013-09-06 06:14:16 -07:00
commit 309836c5c8
4 changed files with 38 additions and 0 deletions

View File

@ -199,6 +199,13 @@ def _mkstemp_inner(dir, pre, suf, flags):
return (fd, _os.path.abspath(file))
except FileExistsError:
continue # try again
except PermissionError:
# This exception is thrown when a directory with the chosen name
# already exists on windows.
if _os.name == 'nt':
continue
else:
raise
raise FileExistsError(_errno.EEXIST,
"No usable temporary file name found")

View File

@ -373,6 +373,32 @@ class TestMkstempInner(BaseTestCase):
os.lseek(f.fd, 0, os.SEEK_SET)
self.assertEqual(os.read(f.fd, 20), b"blat")
def test_collision_with_existing_directory(self):
# _mkstemp_inner tries another name when a directory with
# the chosen name already exists
container_dir = tempfile.mkdtemp()
try:
def mock_get_candidate_names():
return iter(['aaa', 'aaa', 'bbb'])
with support.swap_attr(tempfile,
'_get_candidate_names',
mock_get_candidate_names):
dir = tempfile.mkdtemp(dir=container_dir)
self.assertTrue(dir.endswith('aaa'))
flags = tempfile._bin_openflags
(fd, name) = tempfile._mkstemp_inner(container_dir,
tempfile.template,
'',
flags)
try:
self.assertTrue(name.endswith('bbb'))
finally:
os.close(fd)
os.unlink(name)
finally:
support.rmtree(container_dir)
class TestGetTempPrefix(BaseTestCase):
"""Test gettempprefix()."""

View File

@ -1157,6 +1157,7 @@ Daniel Shahaf
Ha Shao
Mark Shannon
Richard Shapiro
Vlad Shcherbina
Justin Sheehy
Charlie Shepherd
Bruce Sherwood

View File

@ -189,6 +189,10 @@ Library
- Issue #8860: Fixed rounding in timedelta constructor.
- Issue #18849: Fixed a Windows-specific tempfile bug where collision with an
existing directory caused mkstemp and related APIs to fail instead of
retrying. Report and fix by Vlad Shcherbina.
Tests
-----