From a82642f9dbdff5253f40d4acee0cbb27aaf34462 Mon Sep 17 00:00:00 2001
From: Martin Panter <vadmium+py@gmail.com>
Date: Thu, 19 Nov 2015 04:48:44 +0000
Subject: [PATCH] Issue #25583: Avoid incorrect errors raised by
 os.makedirs(exist_ok=True)

---
 Lib/os.py           | 8 +++++---
 Lib/test/test_os.py | 3 +++
 Misc/NEWS           | 3 +++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Lib/os.py b/Lib/os.py
index a8f6a0b8db9..27b241ae97d 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -226,7 +226,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):
@@ -235,8 +235,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 1f7e49c6377..e29b0d585c7 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -971,6 +971,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)
+
     @unittest.skipUnless(hasattr(os, 'chown'), 'test needs os.chown')
     def test_chown_uid_gid_arguments_must_be_index(self):
         stat = os.stat(support.TESTFN)
diff --git a/Misc/NEWS b/Misc/NEWS
index e98e4a64888..f82696ac481 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -106,6 +106,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 #25593: Change semantics of EventLoop.stop() in asyncio.
 
 - Issue #6973: When we know a subprocess.Popen process has died, do