Skip to content

GH-73991: Disallow copying directory into itself via pathlib.Path.copy() #122924

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

Merged
barneygale merged 9 commits into from
Aug 23, 2024
Merged

GH-73991: Disallow copying directory into itself via pathlib.Path.copy() #122924

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e2b4c6d
GH-73991: Disallow copying directory into itself via `pathlib.Path.co…
barneygale Aug 12, 2024
d646ad2
Tweak import
barneygale Aug 12, 2024
c5a79d0
Expand tests
barneygale Aug 12, 2024
f58c07a
Add comment to _ensure_distinct_path()
barneygale Aug 13, 2024
b119e3d
Improve wording
barneygale Aug 13, 2024
32530b7
Add tests for symlink-to-other-symlink copies.
barneygale Aug 18, 2024
a15f248
Fix windows tests
barneygale Aug 18, 2024
d371b89
More Windows goodness
barneygale Aug 18, 2024
7f5b1ab
Address review feedback
barneygale Aug 23, 2024
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
Prev Previous commit
Next Next commit
Tweak import
  • Loading branch information
@barneygale
barneygale committed Aug 12, 2024
commit d646ad23c72cefcc8d78317a730c94351b64787e
8 changes: 4 additions & 4 deletions Lib/pathlib/_abc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
resemble pathlib's PurePath and Path respectively.
"""

import errno
import functools
import operator
import posixpath
from errno import EINVAL
from glob import _GlobberBase, _no_recurse_symlinks
from stat import S_ISDIR, S_ISLNK, S_ISREG, S_ISSOCK, S_ISBLK, S_ISCHR, S_ISFIFO
from pathlib._os import copyfileobj
Expand Down Expand Up @@ -574,7 +574,7 @@ def _ensure_different_file(self, other_path):
return
except (OSError, ValueError):
return
err = OSError(errno.EINVAL, "Source and target are the same file")
err = OSError(EINVAL, "Source and target are the same file")
err.filename = str(self)
err.filename2 = str(other_path)
raise err
Expand All @@ -584,9 +584,9 @@ def _ensure_distinct_path(self, other_path):
Raise OSError(EINVAL) if the other path is within this path.
"""
if self == other_path:
err = OSError(errno.EINVAL, "Source and target are the same path")
err = OSError(EINVAL, "Source and target are the same path")
elif self in other_path.parents:
err = OSError(errno.EINVAL, "Source path is a parent of target path")
err = OSError(EINVAL, "Source path is a parent of target path")
else:
return
err.filename = str(self)
Expand Down