Simplify patch

Author: barneygale

Lib/pathlib/_abc.py

@@ -927,6 +927,17 @@ def move(self, target):
         """
         Recursively move this file or directory tree to the given destination.
         """
+        self._check_files_differ(target)
+        try:
+            return self.replace(target)
+        except UnsupportedOperation:
+            pass
+        except TypeError:
+            if not isinstance(target, PathBase):
+                raise
+        except OSError as err:
+            if err.errno != errno.EXDEV:
+                raise
         target = self.copy(target, follow_symlinks=False, preserve_metadata=True)
         self.delete()
         return target

Lib/pathlib/_local.py

@@ -1,4 +1,3 @@
-import errno
 import io
 import ntpath
 import operator
@@ -854,21 +853,6 @@ def onexc(func, filename, err):
 
     delete.avoids_symlink_attacks = shutil.rmtree.avoids_symlink_attacks
 
-    def move(self, target):
-        """
-        Recursively move this file or directory tree to the given destination.
-        """
-        self._check_files_differ(target)
-        try:
-            return self.replace(target)
-        except TypeError:
-            if not isinstance(target, PathBase):
-                raise
-        except OSError as err:
-            if err.errno != errno.EXDEV:
-                raise
-        return PathBase.move(self, target)
-
     def rename(self, target):
         """
         Rename this path to the target path.