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.
diff --git a/Lib/tempfile.py b/Lib/tempfile.py
index 8a165ed..91332b6 100644
--- a/Lib/tempfile.py
+++ b/Lib/tempfile.py
@@ -219,6 +219,13 @@
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")
diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py
index 2962939..b56d648 100644
--- a/Lib/test/test_tempfile.py
+++ b/Lib/test/test_tempfile.py
@@ -372,6 +372,32 @@
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()."""
diff --git a/Misc/ACKS b/Misc/ACKS
index 20eeafd..db01d14 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1121,6 +1121,7 @@
Ha Shao
Mark Shannon
Richard Shapiro
+Vlad Shcherbina
Justin Sheehy
Charlie Shepherd
Bruce Sherwood
diff --git a/Misc/NEWS b/Misc/NEWS
index 8052c6b..1c0f3b2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -280,6 +280,10 @@
- Issue #18113: Fixed a refcount leak in the curses.panel module's
set_userptr() method. Reported by Atsuo Ishimoto.
+- 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.
+
C API
-----