Fixed OSFS.copy(..., preserve_time=True).

Author: atollk

fs/base.py

@@ -22,7 +22,7 @@
 import six
 
 from . import copy, errors, fsencode, iotools, move, tools, walk, wildcard
-from .copy import copy_cmtime
+from .copy import copy_mtime
 from .glob import BoundGlobber
 from .mode import validate_open_mode
 from .path import abspath, join, normpath
@@ -426,7 +426,7 @@ def copy(
             with closing(self.open(src_path, "rb")) as read_file:
                 # FIXME(@althonos): typing complains because open return IO
                 self.upload(dst_path, read_file)  # type: ignore
-            copy_cmtime(self, src_path, self, dst_path)
+            copy_mtime(self, src_path, self, dst_path)
 
     def copydir(
         self,
@@ -1155,7 +1155,7 @@ def move(self, src_path, dst_path, overwrite=False, preserve_time=False):
             with self.open(src_path, "rb") as read_file:
                 # FIXME(@althonos): typing complains because open return IO
                 self.upload(dst_path, read_file)  # type: ignore
-            copy_cmtime(self, src_path, self, dst_path)
+            copy_mtime(self, src_path, self, dst_path)
             self.remove(src_path)
 
     def open(

fs/copy.py

@@ -159,7 +159,7 @@ def copy_file(
                     else:
                         with _src_fs.openbin(src_path) as read_file:
                             _dst_fs.upload(dst_path, read_file)
-                    copy_cmtime(_src_fs, src_path, _dst_fs, dst_path)
+                    copy_mtime(_src_fs, src_path, _dst_fs, dst_path)
 
 
 def copy_file_internal(
@@ -199,7 +199,7 @@ def copy_file_internal(
         with src_fs.openbin(src_path) as read_file:
             dst_fs.upload(dst_path, read_file)
 
-    copy_cmtime(src_fs, src_path, dst_fs, dst_path)
+    copy_mtime(src_fs, src_path, dst_fs, dst_path)
 
 
 def copy_file_if_newer(
@@ -445,7 +445,7 @@ def dst():
                             on_copy(_src_fs, dir_path, _dst_fs, copy_path)
 
 
-def copy_cmtime(
+def copy_mtime(
     src_fs,  # type: Union[FS, Text]
     src_path,  # type: Text
     dst_fs,  # type: Union[FS, Text]

fs/osfs.py

@@ -49,6 +49,7 @@
 from .mode import Mode, validate_open_mode
 from .errors import FileExpected, NoURL
 from ._url_tools import url_quote
+from .copy import copy_mtime
 
 if typing.TYPE_CHECKING:
     from typing import (
@@ -452,6 +453,8 @@ def copy(self, src_path, dst_path, overwrite=False, preserve_time=False):
                             while sent > 0:
                                 sent = sendfile(fd_dst, fd_src, offset, maxsize)
                                 offset += sent
+                    if preserve_time:
+                        copy_mtime(self, src_path, self, dst_path)
                 except OSError as e:
                     # the error is not a simple "sendfile not supported" error
                     if e.errno not in self._sendfile_error_codes:

tests/test_osfs.py

@@ -100,10 +100,9 @@ def test_expand_vars(self):
     def test_copy_preserve_time(self):
         self.fs.makedir("foo")
         self.fs.makedir("bar")
-        now = time.time() - 10000
-        if not self.fs.create("foo/file.txt"):
-            raw_info = {"details": {"accessed": now, "modified": now}}
-            self.fs.setinfo("foo/file.txt", raw_info)
+        self.fs.create("foo/file.txt")
+        raw_info = {"details": {"modified": time.time() - 10000}}
+        self.fs.setinfo("foo/file.txt", raw_info)
 
         namespaces = ("details", "modified")
         src_info = self.fs.getinfo("foo/file.txt", namespaces)