Skip to content

gh-84538: add strict argument to pathlib.PurePath.relative_to #19813

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
miss-islington merged 17 commits into from
Oct 28, 2022
Merged

gh-84538: add strict argument to pathlib.PurePath.relative_to #19813

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ec64368
bpo-40358: add strict param to pathlib.PurePath.relative_to
domragusa Apr 30, 2020
6d721a0
resolve conflicts with GH-19611
domragusa May 28, 2020
09422e7
Merge branch 'python:main' into relative_to_strict_param
domragusa May 15, 2021
d9c07c2
Update Doc/library/pathlib.rst
domragusa May 15, 2021
029c3d5
fix wording in documentation as requested
domragusa May 17, 2021
01e789b
fix typo
domragusa May 17, 2021
39b24f3
change strict argument to walk_up in pathlib.PurePath.relative_to
domragusa May 29, 2021
ad9c0dd
Merge branch 'main' into relative_to_strict_param
domragusa Oct 14, 2022
8401974
make the documentation clearer
domragusa Oct 14, 2022
e255f99
Apply suggestions from code review
domragusa Oct 22, 2022
b781356
Update Lib/pathlib.py
domragusa Oct 22, 2022
7974ee9
fix doc warning
domragusa Oct 22, 2022
8a4edb5
improve variable names
domragusa Oct 22, 2022
e6cf222
remove trailing spaces
domragusa Oct 22, 2022
b8b218c
Merge branch 'main' into relative_to_strict_param
domragusa Oct 22, 2022
a4c77c2
Update Doc/library/pathlib.rst
brettcannon Oct 28, 2022
97a5e22
Merge branch 'main' into relative_to_strict_param
brettcannon Oct 28, 2022
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
improve variable names
  • Loading branch information
@domragusa
domragusa committed Oct 22, 2022
commit 8a4edb5dac97c6c076d31ebebc8a3bbc1466e4c0
38 changes: 19 additions & 19 deletions Lib/pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,35 +647,35 @@ def relative_to(self, *other, walk_up=False):
abs_parts = [drv, root] + parts[1:]
else:
abs_parts = parts
to_drv, to_root, to_parts = self._parse_args(other)
if to_root:
to_abs_parts = [to_drv, to_root] + to_parts[1:]
other_drv, other_root, other_parts = self._parse_args(other)
if other_root:
other_abs_parts = [other_drv, other_root] + other_parts[1:]
else:
to_abs_parts = to_parts
n = len(to_abs_parts)
cf = self._flavour.casefold_parts
common = 0
for p, tp in zip(cf(abs_parts), cf(to_abs_parts)):
if p != tp:
other_abs_parts = other_parts
num_parts = len(other_abs_parts)
casefold = self._flavour.casefold_parts
num_common_parts = 0
for part, other_part in zip(casefold(abs_parts), casefold(other_abs_parts)):
if part != other_part:
break
common += 1
num_common_parts += 1
if walk_up:
failure = root != to_root
if drv or to_drv:
failure = cf([drv]) != cf([to_drv]) or (failure and n > 1)
failure = root != other_root
if drv or other_drv:
failure = casefold([drv]) != casefold([other_drv]) or (failure and num_parts > 1)
error_message = "{!r} is not on the same drive as {!r}"
up_parts = (n-common)*['..']
up_parts = (num_parts-num_common_parts)*['..']
else:
failure = (root or drv) if n == 0 else common != n
failure = (root or drv) if num_parts == 0 else num_common_parts != num_parts
error_message = "{!r} is not in the subpath of {!r}"
up_parts = []
error_message += " OR one path is relative and the other is absolute."
if failure:
formatted = self._format_parsed_parts(to_drv, to_root, to_parts)
formatted = self._format_parsed_parts(other_drv, other_root, other_parts)
raise ValueError(error_message.format(str(self), str(formatted)))
Comment thread
brettcannon marked this conversation as resolved.
path_parts = up_parts + abs_parts[common:]
return self._from_parsed_parts('', root if common == 1 else '',
path_parts)
path_parts = up_parts + abs_parts[num_common_parts:]
new_root = root if num_common_parts == 1 else ''
return self._from_parsed_parts('', new_root, path_parts)

def is_relative_to(self, *other):
"""Return True if the path is relative to another path or False.
Expand Down