mkdirp -> os.makedirs(..., exist_ok=True)

asottile · asottile · commit 2a9893d0f07e · 2020-01-12T13:39:53.000-08:00
diff --git a/pre_commit/commands/install_uninstall.py b/pre_commit/commands/install_uninstall.py
@@ -14,7 +14,6 @@
 from pre_commit.repository import install_hook_envs
 from pre_commit.store import Store
 from pre_commit.util import make_executable
-from pre_commit.util import mkdirp
 from pre_commit.util import resource_text
 
 
@@ -78,7 +77,7 @@ def _install_hook_script(
 ) -> None:
     hook_path, legacy_path = _hook_paths(hook_type, git_dir=git_dir)
 
-    mkdirp(os.path.dirname(hook_path))
+    os.makedirs(os.path.dirname(hook_path), exist_ok=True)
 
     # If we have an existing hook, move it to pre-commit.legacy
     if os.path.lexists(hook_path) and not is_our_script(hook_path):
diff --git a/pre_commit/staged_files_only.py b/pre_commit/staged_files_only.py
@@ -8,7 +8,6 @@
 from pre_commit.util import CalledProcessError
 from pre_commit.util import cmd_output
 from pre_commit.util import cmd_output_b
-from pre_commit.util import mkdirp
 from pre_commit.xargs import xargs
 
 
@@ -55,7 +54,7 @@ def _unstaged_changes_cleared(patch_dir: str) -> Generator[None, None, None]:
             f'Stashing unstaged files to {patch_filename}.',
         )
         # Save the current unstaged changes as a patch
-        mkdirp(patch_dir)
+        os.makedirs(patch_dir, exist_ok=True)
         with open(patch_filename, 'wb') as patch_file:
             patch_file.write(diff_stdout_binary)
 
diff --git a/pre_commit/store.py b/pre_commit/store.py
@@ -16,7 +16,6 @@
 from pre_commit.util import CalledProcessError
 from pre_commit.util import clean_path_on_failure
 from pre_commit.util import cmd_output_b
-from pre_commit.util import mkdirp
 from pre_commit.util import resource_text
 from pre_commit.util import rmtree
 
@@ -45,7 +44,7 @@ def __init__(self, directory: Optional[str] = None) -> None:
         self.db_path = os.path.join(self.directory, 'db.db')
 
         if not os.path.exists(self.directory):
-            mkdirp(self.directory)
+            os.makedirs(self.directory, exist_ok=True)
             with open(os.path.join(self.directory, 'README'), 'w') as f:
                 f.write(
                     'This directory is maintained by the pre-commit project.\n'
diff --git a/pre_commit/util.py b/pre_commit/util.py
@@ -29,14 +29,6 @@
 EnvironT = Union[Dict[str, str], 'os._Environ']
 
 
-def mkdirp(path: str) -> None:
-    try:
-        os.makedirs(path)
-    except OSError:
-        if not os.path.exists(path):
-            raise
-
-
 @contextlib.contextmanager
 def clean_path_on_failure(path: str) -> Generator[None, None, None]:
     """Cleans up the directory on an exceptional failure."""
diff --git a/tests/commands/install_uninstall_test.py b/tests/commands/install_uninstall_test.py
@@ -14,7 +14,6 @@
 from pre_commit.parse_shebang import find_executable
 from pre_commit.util import cmd_output
 from pre_commit.util import make_executable
-from pre_commit.util import mkdirp
 from pre_commit.util import resource_text
 from testing.fixtures import git_dir
 from testing.fixtures import make_consuming_repo
@@ -307,7 +306,7 @@ def test_failing_hooks_returns_nonzero(tempdir_factory, store):
 
 
 def _write_legacy_hook(path):
-    mkdirp(os.path.join(path, '.git/hooks'))
+    os.makedirs(os.path.join(path, '.git/hooks'), exist_ok=True)
     with open(os.path.join(path, '.git/hooks/pre-commit'), 'w') as f:
         f.write('#!/usr/bin/env bash\necho "legacy hook"\n')
     make_executable(f.name)
@@ -370,7 +369,7 @@ def test_failing_existing_hook_returns_1(tempdir_factory, store):
     path = make_consuming_repo(tempdir_factory, 'script_hooks_repo')
     with cwd(path):
         # Write out a failing "old" hook
-        mkdirp(os.path.join(path, '.git/hooks'))
+        os.makedirs(os.path.join(path, '.git/hooks'), exist_ok=True)
         with open(os.path.join(path, '.git/hooks/pre-commit'), 'w') as f:
             f.write('#!/usr/bin/env bash\necho "fail!"\nexit 1\n')
         make_executable(f.name)
@@ -432,7 +431,7 @@ def test_replace_old_commit_script(tempdir_factory, store):
             CURRENT_HASH, PRIOR_HASHES[-1],
         )
 
-        mkdirp(os.path.join(path, '.git/hooks'))
+        os.makedirs(os.path.join(path, '.git/hooks'), exist_ok=True)
         with open(os.path.join(path, '.git/hooks/pre-commit'), 'w') as f:
             f.write(new_contents)
         make_executable(f.name)
@@ -609,7 +608,7 @@ def test_pre_push_legacy(tempdir_factory, store):
     path = tempdir_factory.get()
     cmd_output('git', 'clone', upstream, path)
     with cwd(path):
-        mkdirp(os.path.join(path, '.git/hooks'))
+        os.makedirs(os.path.join(path, '.git/hooks'), exist_ok=True)
         with open(os.path.join(path, '.git/hooks/pre-push'), 'w') as f:
             f.write(
                 '#!/usr/bin/env bash\n'
@@ -658,7 +657,7 @@ def test_commit_msg_integration_passing(
 
 def test_commit_msg_legacy(commit_msg_repo, tempdir_factory, store):
     hook_path = os.path.join(commit_msg_repo, '.git/hooks/commit-msg')
-    mkdirp(os.path.dirname(hook_path))
+    os.makedirs(os.path.dirname(hook_path), exist_ok=True)
     with open(hook_path, 'w') as hook_file:
         hook_file.write(
             '#!/usr/bin/env bash\n'
@@ -713,7 +712,7 @@ def test_prepare_commit_msg_legacy(
     hook_path = os.path.join(
         prepare_commit_msg_repo, '.git/hooks/prepare-commit-msg',
     )
-    mkdirp(os.path.dirname(hook_path))
+    os.makedirs(os.path.dirname(hook_path), exist_ok=True)
     with open(hook_path, 'w') as hook_file:
         hook_file.write(
             '#!/usr/bin/env bash\n'
