Respect exist_ok in mkdir when creating parent directories (#83)

* Respect exist_ok in mkdir when creating parent directories

* Add makedirs and fix tests

* Tests for makedirs

Author: rahuliyer95

upath/core.py

@@ -80,6 +80,11 @@ def mkdir(self, path, create_parents=True, **kwargs):
             self._format_path(path), create_parents=create_parents, **kwargs
         )
 
+    def makedirs(self, path, exist_ok=False, **kwargs):
+        return self._fs.makedirs(
+            self._format_path(path), exist_ok=exist_ok, **kwargs
+        )
+
     def touch(self, path, **kwargs):
         return self._fs.touch(self._format_path(path), **kwargs)
 
@@ -444,12 +449,9 @@ def mkdir(
         Create a new directory at this given path.
         """
         if parents:
-            self._accessor.mkdir(
-                self,
-                create_parents=True,
-                exist_ok=exist_ok,
-                mode=mode,
-            )
+            if not exist_ok and self.exists():
+                raise FileExistsError
+            self._accessor.makedirs(self, exist_ok=exist_ok)
         else:
             try:
                 self._accessor.mkdir(

upath/tests/cases.py

@@ -156,6 +156,36 @@ def test_mkdir_exists_ok_false(self):
         with pytest.raises(FileExistsError):
             new_dir.mkdir(exist_ok=False)
 
+    def test_mkdir_parents_true_exists_ok_true(self):
+        new_dir = self.path.joinpath("parent", "new_dir_may_not_exist")
+        new_dir.mkdir(parents=True)
+        if not self.SUPPORTS_EMPTY_DIRS:
+            new_dir.joinpath(".file").touch()
+        new_dir.mkdir(parents=True, exist_ok=True)
+
+    def test_mkdir_parents_true_exists_ok_false(self):
+        new_dir = self.path.joinpath("parent", "new_dir_may_exist")
+        new_dir.mkdir(parents=True)
+        if not self.SUPPORTS_EMPTY_DIRS:
+            new_dir.joinpath(".file").touch()
+        with pytest.raises(FileExistsError):
+            new_dir.mkdir(parents=True, exist_ok=False)
+
+    def test_makedirs_exist_ok_true(self):
+        new_dir = self.path.joinpath("parent", "child", "dir_may_not_exist")
+        new_dir._accessor.makedirs(new_dir, exist_ok=True)
+        if not self.SUPPORTS_EMPTY_DIRS:
+            new_dir.joinpath(".file").touch()
+        new_dir._accessor.makedirs(new_dir, exist_ok=True)
+
+    def test_makedirs_exist_ok_false(self):
+        new_dir = self.path.joinpath("parent", "child", "dir_may_exist")
+        new_dir._accessor.makedirs(new_dir, exist_ok=False)
+        if not self.SUPPORTS_EMPTY_DIRS:
+            new_dir.joinpath(".file").touch()
+        with pytest.raises(FileExistsError):
+            new_dir._accessor.makedirs(new_dir, exist_ok=False)
+
     def test_open(self):
         pass
 

upath/tests/implementations/test_azure.py

@@ -37,3 +37,7 @@ def test_rmdir(self):
 
         with pytest.raises(NotADirectoryError):
             (self.path / "a" / "file.txt").rmdir()
+
+    @pytest.mark.skip
+    def test_makedirs_exist_ok_false(self):
+        pass

upath/tests/implementations/test_gcs.py

@@ -29,3 +29,7 @@ def test_rmdir(self):
         assert not mock_dir.exists()
         with pytest.raises(NotADirectoryError):
             self.path.joinpath("file1.txt").rmdir()
+
+    @pytest.mark.skip
+    def test_makedirs_exist_ok_false(self):
+        pass

upath/tests/implementations/test_http.py

@@ -46,6 +46,22 @@ def test_mkdir_exists_ok_false(self):
     def test_mkdir_exists_ok_true(self):
         pass
 
+    @pytest.mark.skip
+    def test_mkdir_parents_true_exists_ok_true(self):
+        pass
+
+    @pytest.mark.skip
+    def test_mkdir_parents_true_exists_ok_false(self):
+        pass
+
+    @pytest.mark.skip
+    def test_makedirs_exist_ok_true(self):
+        pass
+
+    @pytest.mark.skip
+    def test_makedirs_exist_ok_false(self):
+        pass
+
     @pytest.mark.skip
     def test_touch_unlink(self):
         pass

upath/tests/implementations/test_s3.py

@@ -94,6 +94,10 @@ def test_iterdir_with_plus_in_name(self, s3_with_plus_chr_name):
         (file,) = files
         assert file == p.joinpath("file.txt")
 
+    @pytest.mark.skip
+    def test_makedirs_exist_ok_false(self):
+        pass
+
 
 @pytest.fixture
 def s3_with_plus_chr_name(s3_server):