Simplify ensuredir() with Python3 stdlib features

- Simplify ensuredir() to equivalent os.makedir(name, exist_ok=True)
- Do not check if a directory exists before calling
  ensuredir() (ensuredir() already handles it)
- Add exist_ok argument to path.makedirs() to follow same pattern
- Drop unnecessary .exists() check immediately before .isdir()
- Add tests for ensuredir

1 files changed, 1 insertions, 7 deletions

diff --git a/sphinx/util/osutil.py b/sphinx/util/osutil.py
index c7c0b0690..198076664 100644
--- a/sphinx/util/osutil.py
+++ b/sphinx/util/osutil.py
@@ -82,13 +82,7 @@ def relative_uri(base, to):
 def ensuredir(path):
     # type: (unicode) -> None
     """Ensure that a path exists."""
-    try:
-        os.makedirs(path)
-    except OSError:
-        # If the path is already an existing directory (not a file!),
-        # that is OK.
-        if not os.path.isdir(path):
-            raise
+    os.makedirs(path, exist_ok=True)  # type: ignore
 
 
 def walk(top, topdown=True, followlinks=False):