Tidying, naming.

Author: barneygale

Lib/pathlib/__init__.py

@@ -1128,7 +1128,7 @@ def copy_into(self, target_dir, **kwargs):
     def _copy_from(self, source, follow_symlinks=True, preserve_metadata=False):
         """
         Recursively copy the given path to this path. This a generator
-        function that yields (target, source, part_size) tuples as the copying
+        function that yields (target, source, sent) tuples as the copying
         operation progresses.
         """
         yield self, source, 0
@@ -1143,8 +1143,8 @@ def _copy_from(self, source, follow_symlinks=True, preserve_metadata=False):
             if preserve_metadata:
                 copy_info(source.info, self)
         else:
-            for part_size in self._copy_from_file(source, preserve_metadata):
-                yield self, source, part_size
+            for sent in self._copy_from_file(source, preserve_metadata):
+                yield self, source, sent
 
     def _copy_from_file(self, source, preserve_metadata=False):
         ensure_different_files(source, self)
@@ -1164,8 +1164,8 @@ def _copy_from_file(self, source, preserve_metadata=False):
                 pass
             else:
                 copyfile2(source, str(self))
-                return iter([])
-            return self._copy_from_file_fallback(source, preserve_metadata)
+                return
+            yield from self._copy_from_file_fallback(source, preserve_metadata)
 
     if os.name == 'nt':
         # If a directory-symlink is copied *before* its target, then

Lib/pathlib/_os.py

@@ -72,15 +72,12 @@ def _copy_file_range(source_fd, target_fd):
         copy.
         This should work on Linux >= 4.5 only.
         """
+        fn = os.copy_file_range
         blocksize = _get_copy_blocksize(source_fd)
         offset = 0
-        while True:
-            sent = os.copy_file_range(source_fd, target_fd, blocksize,
-                                      offset_dst=offset)
-            if sent == 0:
-                break  # EOF
-            offset += sent
+        while sent := fn(source_fd, target_fd, blocksize, None, offset):
             yield sent
+            offset += sent
 else:
     _copy_file_range = None
 
@@ -91,14 +88,12 @@ def _sendfile(source_fd, target_fd):
         high-performance sendfile(2) syscall.
         This should work on Linux >= 2.6.33 only.
         """
+        fn = os.sendfile
         blocksize = _get_copy_blocksize(source_fd)
         offset = 0
-        while True:
-            sent = os.sendfile(target_fd, source_fd, offset, blocksize)
-            if sent == 0:
-                break  # EOF
-            offset += sent
+        while sent := fn(target_fd, source_fd, offset, blocksize):
             yield sent
+            offset += sent
 else:
     _sendfile = None
 

Lib/pathlib/types.py

@@ -414,7 +414,7 @@ def write_text(self, data, encoding=None, errors=None, newline=None):
     def _copy_from(self, source, follow_symlinks=True):
         """
         Recursively copy the given path to this path. This a generator
-        function that yields (target, source, part_size) tuples as the copying
+        function that yields (target, source, sent) tuples as the copying
         operation progresses.
         """
         stack = [(self, source)]
@@ -432,8 +432,8 @@ def _copy_from(self, source, follow_symlinks=True):
                 ensure_different_files(src, dst)
                 with magic_open(src, 'rb') as source_f:
                     with magic_open(dst, 'wb') as target_f:
-                        for part_size in copyfileobj(source_f, target_f):
-                            yield dst, src, part_size
+                        for sent in copyfileobj(source_f, target_f):
+                            yield dst, src, sent
 
 
 _JoinablePath.register(PurePath)