Merge pull request #5224 from tacaswell/mnt_mkdirs_race

jenshnielsen · jenshnielsen · commit b518616ea8e4 · 2015-10-13T09:36:27.000+01:00
FIX: subtle race condition in cbook.mkdirs
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -1012,19 +1012,16 @@ def mkdirs(newdir, mode=0o777):
         > mkdir -p NEWDIR
         > chmod MODE NEWDIR
     """
-    try:
-        if not os.path.exists(newdir):
-            parts = os.path.split(newdir)
-            for i in range(1, len(parts) + 1):
-                thispart = os.path.join(*parts[:i])
-                if not os.path.exists(thispart):
-                    os.makedirs(thispart, mode)
-
-    except OSError as err:
-        # Reraise the error unless it's about an already existing directory
-        if err.errno != errno.EEXIST or not os.path.isdir(newdir):
-            raise
-
+    # this functionality is now in core python as of 3.2
+    # LPY DROP
+    if six.PY3:
+        os.makedirs(newdir, mode=mode, exist_ok=True)
+    else:
+        try:
+            os.makedirs(newdir, mode=mode)
+        except OSError as exception:
+            if exception.errno != errno.EEXIST:
+                raise
 
 class GetRealpathAndStat(object):
     def __init__(self):
