Raise on existing files in mkdir_p and makedirs_p

newsfragments/+mkdir-p-file.bugfix.rst

@@ -0,0 +1 @@
+``Path.mkdir_p`` and ``Path.makedirs_p`` now raise ``FileExistsError`` when the path already exists as a file.

path/__init__.py

@@ -1369,8 +1369,11 @@ def mkdir(self, mode: int = 0o777) -> Self:
     def mkdir_p(self, mode: int = 0o777) -> Self:
         """Like :meth:`mkdir`, but does not raise an exception if the
         directory already exists."""
-        with contextlib.suppress(FileExistsError):
+        try:
             self.mkdir(mode)
+        except FileExistsError:
+            if not self.is_dir():
+                raise
         return self
 
     def makedirs(self, mode: int = 0o777) -> Self:
@@ -1381,8 +1384,11 @@ def makedirs(self, mode: int = 0o777) -> Self:
     def makedirs_p(self, mode: int = 0o777) -> Self:
         """Like :meth:`makedirs`, but does not raise an exception if the
         directory already exists."""
-        with contextlib.suppress(FileExistsError):
+        try:
             self.makedirs(mode)
+        except FileExistsError:
+            if not self.is_dir():
+                raise
         return self
 
     def rmdir(self) -> Self:

tests/test_path.py

@@ -294,6 +294,18 @@ def test_renames(self, tmpdir):
     def test_mkdir_p(self, tmpdir):
         Path(tmpdir).mkdir_p()
 
+    @pytest.mark.parametrize('method', ['mkdir_p', 'makedirs_p'])
+    def test_mkdir_p_existing_file(self, tmpdir, method):
+        file = (Path(tmpdir) / 'file').touch()
+        with pytest.raises(FileExistsError):
+            getattr(file, method)()
+        assert file.is_file()
+
+    def test_mkdir_p_new_directory(self, tmpdir):
+        directory = Path(tmpdir) / 'new'
+        assert directory.mkdir_p() == directory
+        assert directory.is_dir()
+
     def test_removedirs_p(self, tmpdir):
         dir = Path(tmpdir) / 'somedir'
         dir.mkdir()