use OSFS instead of fs_open, rename cleanup_dst_on_error param

Author: tfeldmann

fs/move.py

@@ -6,11 +6,11 @@
 
 import typing
 
-from . import open_fs
 from .copy import copy_dir
 from .copy import copy_file
 from .errors import FSError
 from .opener import manage_fs
+from .osfs import OSFS
 from .path import frombase
 from ._pathcompat import commonpath
 
@@ -46,7 +46,7 @@ def move_file(
     dst_fs,  # type: Union[Text, FS]
     dst_path,  # type: Text
     preserve_time=False,  # type: bool
-    cleanup_dest_on_error=True,  # type: bool
+    cleanup_dst_on_error=True,  # type: bool
 ):
     # type: (...) -> None
     """Move a file from one filesystem to another.
@@ -58,8 +58,8 @@ def move_file(
         dst_path (str): Path to a file on ``dst_fs``.
         preserve_time (bool): If `True`, try to preserve mtime of the
             resources (defaults to `False`).
-        cleanup_dest_on_error (bool): If `True`, tries to delete the file copied to
-            dst_fs if deleting the file from src_fs fails.
+        cleanup_dst_on_error (bool): If `True`, tries to delete the file copied to
+            `dst_fs` if deleting the file from `src_fs` fails (defaults to `True`).
 
     """
     with manage_fs(src_fs, writeable=True) as _src_fs:
@@ -78,12 +78,13 @@ def move_file(
                     src_syspath = _src_fs.getsyspath(src_path)
                     dst_syspath = _dst_fs.getsyspath(dst_path)
                     common = commonpath([src_syspath, dst_syspath])
-                    rel_src = frombase(common, src_syspath)
-                    rel_dst = frombase(common, dst_syspath)
-                    with _src_fs.lock(), _dst_fs.lock():
-                        with open_fs(common, writeable=True) as base:
-                            base.move(rel_src, rel_dst, preserve_time=preserve_time)
-                            return  # optimization worked, exit early
+                    if common:
+                        rel_src = frombase(common, src_syspath)
+                        rel_dst = frombase(common, dst_syspath)
+                        with _src_fs.lock(), _dst_fs.lock():
+                            with OSFS(common) as base:
+                                base.move(rel_src, rel_dst, preserve_time=preserve_time)
+                                return  # optimization worked, exit early
                 except ValueError:
                     # This is raised if we cannot find a common base folder.
                     # In this case just fall through to the standard method.
@@ -103,7 +104,7 @@ def move_file(
                 except FSError as e:
                     # if the source cannot be removed we delete the copy on the
                     # destination
-                    if cleanup_dest_on_error:
+                    if cleanup_dst_on_error:
                         _dst_fs.remove(dst_path)
                     raise e
 
@@ -130,22 +131,16 @@ def move_dir(
             resources (defaults to `False`).
 
     """
-
-    def src():
-        return manage_fs(src_fs, writeable=True)
-
-    def dst():
-        return manage_fs(dst_fs, writeable=True, create=True)
-
-    with src() as _src_fs, dst() as _dst_fs:
-        with _src_fs.lock(), _dst_fs.lock():
-            _dst_fs.makedir(dst_path, recreate=True)
-            copy_dir(
-                src_fs,
-                src_path,
-                dst_fs,
-                dst_path,
-                workers=workers,
-                preserve_time=preserve_time,
-            )
-            _src_fs.removetree(src_path)
+    with manage_fs(src_fs, writeable=True) as _src_fs:
+        with manage_fs(dst_fs, writeable=True, create=True) as _dst_fs:
+            with _src_fs.lock(), _dst_fs.lock():
+                _dst_fs.makedir(dst_path, recreate=True)
+                copy_dir(
+                    src_fs,
+                    src_path,
+                    dst_fs,
+                    dst_path,
+                    workers=workers,
+                    preserve_time=preserve_time,
+                )
+                _src_fs.removetree(src_path)