Merge branch 'main' into path-move

python · barneygale · Aug 25, 2024 · Jul 21, 2024 · Jul 21, 2024 · Jul 21, 2024
commit 175d687a1d9b65ee665685e2e71488958d8d2aa4
@@ -14,7 +14,7 @@
 import functools
 import operator
 import posixpath
-from errno import EXDEV
+from errno import EINVAL, EXDEV
 from glob import _GlobberBase, _no_recurse_symlinks
 from stat import S_ISDIR, S_ISLNK, S_ISREG, S_ISSOCK, S_ISBLK, S_ISCHR, S_ISFIFO
 from pathlib._os import copyfileobj
@@ -932,8 +932,7 @@ def move(self, target):
         """
         Recursively move this file or directory tree to the given destination.
         """
-        if self._samefile_safe(target):
-            raise OSError(f"{self!r} and {target!r} are the same file")
+        self._ensure_different_file(target)
         try:
             return self.replace(target)
         except UnsupportedOperation:

@@ -1501,10 +1501,9 @@ def iterdir(self):
             raise FileNotFoundError(errno.ENOENT, "File not found", path)
 
     def mkdir(self, mode=0o777, parents=False, exist_ok=False):
-        path = str(self.resolve())
-        if path in self._files:
-            raise NotADirectoryError(errno.ENOTDIR, "Not a directory", path)
-        elif path in self._directories:
+        path = str(self.parent.resolve() / self.name)
+        parent = str(self.parent.resolve())
+        if path in self._directories or path in self._symlinks:
             if exist_ok:
                 return
             else: