Issue #25583: Merge makedirs fix from 3.5

3 files changed, 11 insertions, 3 deletions

diff --git a/Lib/os.py b/Lib/os.py
index 3d2c6d3..2b89b93 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -230,7 +230,7 @@ def makedirs(name, mode=0o777, exist_ok=False):
         try:
             makedirs(head, mode, exist_ok)
         except FileExistsError:
-            # be happy if someone already created the path
+            # Defeats race condition when another thread created the path
             pass
         cdir = curdir
         if isinstance(tail, bytes):
@@ -239,8 +239,10 @@ def makedirs(name, mode=0o777, exist_ok=False):
             return
     try:
         mkdir(name, mode)
-    except OSError as e:
-        if not exist_ok or e.errno != errno.EEXIST or not path.isdir(name):
+    except OSError:
+        # Cannot rely on checking for EEXIST, since the operating system
+        # could give priority to other errors like EACCES or EROFS
+        if not exist_ok or not path.isdir(name):
             raise
 
 def removedirs(name):
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index e8a7c97..d6880e5 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -1039,6 +1039,9 @@ class MakedirTests(unittest.TestCase):
         os.makedirs(path, mode=mode, exist_ok=True)
         os.umask(old_mask)
 
+        # Issue #25583: A drive root could raise PermissionError on Windows
+        os.makedirs(os.path.abspath('/'), exist_ok=True)
+
     def test_exist_ok_s_isgid_directory(self):
         path = os.path.join(support.TESTFN, 'dir1')
         S_ISGID = stat.S_ISGID
diff --git a/Misc/NEWS b/Misc/NEWS
index b04de39..72d2073 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -429,6 +429,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #25583: Avoid incorrect errors raised by os.makedirs(exist_ok=True)
+  when the OS gives priority to errors such as EACCES over EEXIST.
+
 - Issue #25590: In the Readline completer, only call getattr() once per
   attribute.