Skip to content

GH-73435: Add pathlib.PurePath.full_match() #114350

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
Jan 26, 2024
Merged

GH-73435: Add pathlib.PurePath.full_match() #114350

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1c8bf81
GH-73435: Add `pathlib.PurePath.globmatch()`
barneygale Jan 20, 2024
7f9222a
Simplify `match()` code slightly.
barneygale Jan 20, 2024
ed203e8
Improve variable names
barneygale Jan 20, 2024
aaa1ddb
`globmatch` --> `full_match`
barneygale Jan 22, 2024
5c2ea0e
Improve docstrings.
barneygale Jan 22, 2024
a5eaf81
Note difference in empty pattern handling.
barneygale Jan 23, 2024
6fd7b01
Double compiled pattern cache size
barneygale Jan 26, 2024
2172b4d
Fix handling of empty paths and patterns.
barneygale Jan 26, 2024
f60f147
Couple more test cases.
barneygale Jan 26, 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
Simplify match() code slightly.
  • Loading branch information
@barneygale
barneygale committed Jan 20, 2024
commit 7f9222a852307c4eddeb6d474e6110f36f2fc15b
19 changes: 10 additions & 9 deletions Lib/pathlib/_abc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,16 +450,17 @@ def match(self, path_pattern, *, case_sensitive=None):
if case_sensitive is None:
case_sensitive = _is_case_sensitive(self.pathmod)
sep = path_pattern.pathmod.sep
delta = len(self.parts) - len(path_pattern.parts)
if delta < 0:
return False # Path is too short.
if delta > 0 and path_pattern.anchor:
return False # Path is too long.
if not path_pattern.parts:
our_parts = self.parts[::-1]
pat_parts = path_pattern.parts[::-1]
Comment thread
barneygale marked this conversation as resolved.
Outdated
if not pat_parts:
raise ValueError("empty pattern")
for path, pattern in zip(reversed(self.parts), reversed(path_pattern.parts)):
match = _compile_pattern(pattern, sep, case_sensitive, recursive=False)
if match(path) is None:
if len(our_parts) < len(pat_parts):
return False
if len(our_parts) > len(pat_parts) and path_pattern.anchor:
return False
for our_part, pat_part in zip(our_parts, pat_parts):
match = _compile_pattern(pat_part, sep, case_sensitive, recursive=False)
if match(our_part) is None:
return False
return True

Expand Down