Repository navigation
Commit 7fcace9
Add the following private methods to `pathlib.Path.info`:
- `_posix_permissions()`: the POSIX file permissions (`S_IMODE(st_mode)`)
- `_file_id()`: the file ID (`(st_dev, st_ino)`)
- `_access_time_ns()`: the access time in nanoseconds (`st_atime_ns`)
- `_mod_time_ns()`: the modify time in nanoseconds (`st_mtime_ns`)
- `_bsd_flags()`: the BSD file flags (`st_flags`)
- `_xattrs()`: the file extended attributes as a list of key, value pairs,
or an empty list if `listxattr()` or `getxattr()` fail in an ignorable
way.
These methods replace `LocalCopyReader.read_metadata()`, and so we can
delete the `CopyReader` and `LocalCopyReader` classes. Rather than reading
metadata via `source._copy_reader.read_metadata()`, we instead call
`source.info._posix_permissions()`, `_access_time_ns()`, etc.
Preserving metadata is only supported for local-to-local copies at the
moment. To support copying metadata between arbitrary `ReadablePath` and
`WritablePath` objects, we'd need to make the new methods public and
documented.
Co-authored-by: Petr Viktorin <encukou@gmail.com>
1 parent bd1642c commit 7fcace9
4 files changed
Lines changed: 204 additions & 206 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -14,7 +14,7 @@ | |||
| 14 | 14 | from abc import ABC, abstractmethod | |
| 15 | 15 | from glob import _PathGlobber, _no_recurse_symlinks | |
| 16 | 16 | from pathlib import PurePath, Path | |
| 17 | - from pathlib._os import magic_open, CopyReader, CopyWriter | ||
| 17 | + from pathlib._os import magic_open, CopyWriter | ||
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | 20 | def _explode_path(path): | |
@@ -353,8 +353,6 @@ def readlink(self): | |||
| 353 | 353 | """ | |
| 354 | 354 | raise NotImplementedError | |
| 355 | 355 | ||
| 356 | - _copy_reader = property(CopyReader) | ||
| 357 | - | ||
| 358 | 356 | def copy(self, target, follow_symlinks=True, dirs_exist_ok=False, | |
| 359 | 357 | preserve_metadata=False): | |
| 360 | 358 | """ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -19,7 +19,7 @@ | |||
| 19 | 19 | except ImportError: | |
| 20 | 20 | grp = None | |
| 21 | 21 | ||
| 22 | - from pathlib._os import LocalCopyReader, LocalCopyWriter, PathInfo, DirEntryInfo | ||
| 22 | + from pathlib._os import LocalCopyWriter, PathInfo, DirEntryInfo, ensure_different_files | ||
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | 25 | __all__ = [ | |
@@ -1079,7 +1079,6 @@ def replace(self, target): | |||
| 1079 | 1079 | os.replace(self, target) | |
| 1080 | 1080 | return self.with_segments(target) | |
| 1081 | 1081 | ||
| 1082 | - _copy_reader = property(LocalCopyReader) | ||
| 1083 | 1082 | _copy_writer = property(LocalCopyWriter) | |
| 1084 | 1083 | ||
| 1085 | 1084 | def copy(self, target, follow_symlinks=True, dirs_exist_ok=False, | |
@@ -1125,7 +1124,7 @@ def move(self, target): | |||
| 1125 | 1124 | else: | |
| 1126 | 1125 | if not hasattr(target, '_copy_writer'): | |
| 1127 | 1126 | target = self.with_segments(target_str) | |
| 1128 | - target._copy_writer._ensure_different_file(self) | ||
| 1127 | + ensure_different_files(self, target) | ||
| 1129 | 1128 | try: | |
| 1130 | 1129 | os.replace(self, target_str) | |
| 1131 | 1130 | return target | |
0 commit comments