Skip to content

Fall back from FICLONE on permission errors and ENOTTY #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
zaniebot wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fall back from FICLONE on permission errors and ENOTTY #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Lib/pathlib/_os.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ def copyfileobj(source_f, target_f):
_ficlone(source_fd, target_fd)
return
except OSError as err:
if err.errno not in (EBADF, EOPNOTSUPP, ETXTBSY, EXDEV):
if err.errno not in (EACCES, EBADF, ENOTTY, EOPNOTSUPP,
EPERM, ETXTBSY, EXDEV):
raise err

# Use OS copy where available.
Expand Down
13 changes: 13 additions & 0 deletions Lib/test/test_pathlib/test_pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1550,6 +1550,19 @@ def raiser(*args, **kwargs):
with mock.patch(patchpoint, make_raiser(errno.ENOENT)):
self.assertRaises(FileNotFoundError, source.copy, target)

@unittest.skipUnless(hasattr(fcntl, 'FICLONE'), 'requires fcntl.FICLONE')
def test_copy_ficlone_fallback(self):
base = self.cls(self.base)
source = base / 'fileA'
for err in (errno.EACCES, errno.ENOTTY, errno.EPERM):
with self.subTest(errno=err):
target = base / f'copy{err}'
error = OSError(err, os.strerror(err))
with mock.patch('fcntl.ioctl', side_effect=error) as ioctl:
source.copy(target)
ioctl.assert_called_once()
self.assertEqual(target.read_bytes(), source.read_bytes())

@unittest.skipIf(sys.platform == "win32" or sys.platform == "wasi", "directories are always readable on Windows and WASI")
@requires_non_root_user
def test_copy_dir_no_read_permission(self):
Expand Down
Loading