Skip to content

[3.12] GH-106330: Fix matching of empty path in pathlib.PurePath.match() (GH-106331) #106372

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 2 commits into from
Jul 4, 2023
Merged

[3.12] GH-106330: Fix matching of empty path in pathlib.PurePath.match() (GH-106331) #106372

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e320740
[3.12] GH-106330: Fix matching of empty path in `pathlib.PurePath.mat…
barneygale Jul 3, 2023
799044d
Backport handling of `*` segments from main.
barneygale Jul 3, 2023
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
Backport handling of * segments from main.
  • Loading branch information
@barneygale
barneygale committed Jul 3, 2023
commit 799044d3047c3c0ea7a6ed41e249a26c6a1fafa9
19 changes: 13 additions & 6 deletions Lib/pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,19 @@ def _compile_pattern_lines(pattern_lines, case_sensitive):
# Match the start of the path, or just after a path separator
parts = ['^']
for part in pattern_lines.splitlines(keepends=True):
# We slice off the common prefix and suffix added by translate() to
# ensure that re.DOTALL is not set, and the end of the string not
# matched, respectively. With DOTALL not set, '*' wildcards will not
# match path separators, because the '.' characters in the pattern
# will not match newlines.
parts.append(fnmatch.translate(part)[_FNMATCH_SLICE])
if part == '*\n':
part = r'.+\n'
elif part == '*':
part = r'.+'
else:
# Any other component: pass to fnmatch.translate(). We slice off
# the common prefix and suffix added by translate() to ensure that
# re.DOTALL is not set, and the end of the string not matched,
# respectively. With DOTALL not set, '*' wildcards will not match
# path separators, because the '.' characters in the pattern will
# not match newlines.
part = fnmatch.translate(part)[_FNMATCH_SLICE]
parts.append(part)
# Match the end of the path, always.
parts.append(r'\Z')
flags = re.MULTILINE
Expand Down