make mkdirp private

Author: oesteban

nipype/sphinxext/plot_workflow.py

@@ -110,13 +110,12 @@
 
 import sys, os, shutil, io, re, textwrap
 from os.path import relpath
+from errno import EEXIST
 import traceback
 
 from docutils.parsers.rst import directives
 from docutils.parsers.rst.directives.images import Image
 
-from nipype.utils.filemanip import mkdirp
-
 
 try:
     # Sphinx depends on either Jinja or Jinja2
@@ -134,6 +133,22 @@ def format_template(template, **kw):
 PY2 = sys.version_info[0] == 2
 PY3 = sys.version_info[0] == 3
 
+def _mkdirp(folder):
+    """
+    Equivalent to bash's mkdir -p
+    """
+    if sys.version_info > (3, 4, 1):
+        os.makedirs(folder, exist_ok=True)
+        return folder
+
+    try:
+        os.makedirs(folder)
+    except OSError as exc:
+        if exc.errno != EEXIST or not os.path.isdir(folder):
+            raise
+
+    return folder
+
 
 def wf_directive(name, arguments, options, content, lineno,
                    content_offset, block_text, state, state_machine):
@@ -685,7 +700,7 @@ def run(arguments, content, options, state_machine, state, lineno):
         state_machine.insert_input(total_lines, source=source_file_name)
 
     # copy image files to builder's output directory, if necessary
-    mkdirp(dest_dir)
+    _mkdirp(dest_dir)
     for code_piece, images in results:
         for img in images:
             for fn in img.filenames():

nipype/utils/filemanip.py

@@ -16,7 +16,6 @@
 import hashlib
 from hashlib import md5
 import os
-from errno import EEXIST
 import re
 import shutil
 import posixpath
@@ -426,18 +425,6 @@ def copyfiles(filelist, dest, copy=False, create_new=False):
             newfiles.insert(i, destfile)
     return newfiles
 
-def mkdirp(folder):
-    """
-    Equivalent to bash's mkdir -p
-    """
-    try:
-        os.makedirs(folder)
-    except OSError as exc:
-        if exc.errno != EEXIST or not os.path.isdir(folder):
-            raise
-
-    return folder
-
 
 def filename_to_list(filename):
     """Returns a list given either a string or a list