Undo changes from pythonGH-122924.

Author: barneygale

Lib/pathlib/_abc.py

@@ -11,10 +11,10 @@
 resemble pathlib's PurePath and Path respectively.
 """
 
-import errno
 import functools
 import operator
 import posixpath
+from errno import 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
@@ -565,33 +565,14 @@ def samefile(self, other_path):
         return (st.st_ino == other_st.st_ino and
                 st.st_dev == other_st.st_dev)
 
-    def _check_files_differ(self, other_path):
+    def _samefile_safe(self, other_path):
         """
-        Raise OSError(EINVAL) if both paths refer to the same file.
+        Like samefile(), but returns False rather than raising OSError.
         """
         try:
-            if not self.samefile(other_path):
-                return
+            return self.samefile(other_path)
         except (OSError, ValueError):
-            return
-        err = OSError(errno.EINVAL, "Source and target are the same file")
-        err.filename = str(self)
-        err.filename2 = str(other_path)
-        raise err
-
-    def _check_paths_disjoint(self, other_path):
-        """
-        Raise OSError(EINVAL) if the other path is within this path.
-        """
-        if self == other_path:
-            err = OSError(errno.EINVAL, "Source and target are the same path")
-        elif self in other_path.parents:
-            err = OSError(errno.EINVAL, "Source path is a parent of target path")
-        else:
-            return
-        err.filename = str(self)
-        err.filename2 = str(other_path)
-        raise err
+            return False
 
     def open(self, mode='r', buffering=-1, encoding=None,
              errors=None, newline=None):
@@ -846,7 +827,8 @@ def _copy_file(self, target):
         """
         Copy the contents of this file to the given target.
         """
-        self._check_files_differ(target)
+        if self._samefile_safe(target):
+            raise OSError(f"{self!r} and {target!r} are the same file")
         with self.open('rb') as source_f:
             try:
                 with target.open('wb') as target_f:
@@ -866,13 +848,6 @@ def copy(self, target, *, follow_symlinks=True, dirs_exist_ok=False,
         """
         if not isinstance(target, PathBase):
             target = self.with_segments(target)
-        try:
-            self._check_paths_disjoint(target)
-        except OSError as err:
-            if on_error is None:
-                raise
-            on_error(err)
-            return
         stack = [(self, target)]
         while stack:
             src, dst = stack.pop()
@@ -927,7 +902,8 @@ def move(self, target):
         """
         Recursively move this file or directory tree to the given destination.
         """
-        self._check_files_differ(target)
+        if self._samefile_safe(target):
+            raise OSError(f"{self!r} and {target!r} are the same file")
         try:
             return self.replace(target)
         except UnsupportedOperation:
@@ -936,7 +912,7 @@ def move(self, target):
             if not isinstance(target, PathBase):
                 raise
         except OSError as err:
-            if err.errno != errno.EXDEV:
+            if err.errno != EXDEV:
                 raise
         target = self.copy(target, follow_symlinks=False, preserve_metadata=True)
         self.delete()

Lib/test/test_pathlib/test_pathlib.py

@@ -793,11 +793,21 @@ def test_move_dir_into_itself_other_fs(self):
     def test_move_file_symlink_other_fs(self):
         self.test_move_file_symlink()
 
+    @patch_replace
+    @needs_symlinks
+    def test_move_file_symlink_to_itself_other_fs(self):
+        self.test_move_file_symlink_to_itself()
+
     @patch_replace
     @needs_symlinks
     def test_move_dir_symlink_other_fs(self):
         self.test_move_dir_symlink()
 
+    @patch_replace
+    @needs_symlinks
+    def test_move_dir_symlink_to_itself_other_fs(self):
+        self.test_move_dir_symlink_to_itself()
+
     @patch_replace
     @needs_symlinks
     def test_move_dangling_symlink_other_fs(self):

Lib/test/test_pathlib/test_pathlib_abc.py

@@ -1825,12 +1825,6 @@ def test_copy_file_empty(self):
         self.assertTrue(target.exists())
         self.assertEqual(target.read_bytes(), b'')
 
-    def test_copy_file_to_itself(self):
-        base = self.cls(self.base)
-        source = base / 'empty'
-        source.write_bytes(b'')
-        self.assertRaises(OSError, source.copy, source)
-
     def test_copy_dir_simple(self):
         base = self.cls(self.base)
         source = base / 'dirC'
@@ -1917,19 +1911,6 @@ def test_copy_dir_to_existing_directory_dirs_exist_ok(self):
         self.assertTrue(target.joinpath('fileC').read_text(),
                         "this is file C\n")
 
-    def test_copy_dir_to_itself(self):
-        base = self.cls(self.base)
-        source = base / 'dirC'
-        self.assertRaises(OSError, source.copy, source)
-
-    def test_copy_dir_to_itself_on_error(self):
-        base = self.cls(self.base)
-        source = base / 'dirC'
-        errors = []
-        source.copy(source, on_error=errors.append)
-        self.assertEqual(len(errors), 1)
-        self.assertIsInstance(errors[0], OSError)
-
     def test_copy_missing_on_error(self):
         base = self.cls(self.base)
         source = base / 'foo'
@@ -2056,17 +2037,22 @@ def test_move_dir_to_dir(self):
         source = base / 'dirC'
         target = base / 'dirB'
         self.assertRaises(OSError, source.move, target)
+        self.assertTrue(source.exists())
+        self.assertTrue(target.exists())
 
     def test_move_dir_to_itself(self):
         base = self.cls(self.base)
         source = base / 'dirC'
         self.assertRaises(OSError, source.move, source)
+        self.assertTrue(source.exists())
 
     def test_move_dir_into_itself(self):
         base = self.cls(self.base)
         source = base / 'dirC'
         target = base / 'dirC' / 'bar'
         self.assertRaises(OSError, source.move, target)
+        self.assertTrue(source.exists())
+        self.assertFalse(target.exists())
 
     @needs_symlinks
     def test_move_file_symlink(self):
@@ -2080,6 +2066,12 @@ def test_move_file_symlink(self):
         self.assertTrue(target.is_symlink())
         self.assertEqual(source_readlink, target.readlink())
 
+    @needs_symlinks
+    def test_move_file_symlink_to_itself(self):
+        base = self.cls(self.base)
+        source = base / 'linkA'
+        self.assertRaises(OSError, source.move, source)
+
     @needs_symlinks
     def test_move_dir_symlink(self):
         base = self.cls(self.base)
@@ -2092,6 +2084,12 @@ def test_move_dir_symlink(self):
         self.assertTrue(target.is_symlink())
         self.assertEqual(source_readlink, target.readlink())
 
+    @needs_symlinks
+    def test_move_dir_symlink_to_itself(self):
+        base = self.cls(self.base)
+        source = base / 'linkB'
+        self.assertRaises(OSError, source.move, source)
+
     @needs_symlinks
     def test_move_dangling_symlink(self):
         base = self.cls(self.base)