changeset:   99219:f0ad5067879b
parent:      99216:2ebe03a94f8f
parent:      99218:515f76bf1254
user:        Martin Panter <vadmium+py@gmail.com>
date:        Fri Nov 20 02:37:29 2015 +0000
files:       Lib/test/test_os.py Misc/NEWS
description:
Issue #25583: Merge makedirs fix from 3.5


diff -r 2ebe03a94f8f -r f0ad5067879b Lib/os.py
--- a/Lib/os.py	Thu Nov 19 13:34:24 2015 -0800
+++ b/Lib/os.py	Fri Nov 20 02:37:29 2015 +0000
@@ -230,7 +230,7 @@
         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 @@
             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 -r 2ebe03a94f8f -r f0ad5067879b Lib/test/test_os.py
--- a/Lib/test/test_os.py	Thu Nov 19 13:34:24 2015 -0800
+++ b/Lib/test/test_os.py	Fri Nov 20 02:37:29 2015 +0000
@@ -1039,6 +1039,9 @@
         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 -r 2ebe03a94f8f -r f0ad5067879b Misc/NEWS
--- a/Misc/NEWS	Thu Nov 19 13:34:24 2015 -0800
+++ b/Misc/NEWS	Fri Nov 20 02:37:29 2015 +0000
@@ -429,6 +429,9 @@
 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.