Skip to content

GH-79634: Accept path-like objects as pathlib glob patterns. #114017

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 7 commits into from
Jan 20, 2024
Merged

GH-79634: Accept path-like objects as pathlib glob patterns. #114017

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4e80705
GH-79634: Accept path-like objects as pathlib glob patterns.
barneygale Jan 12, 2024
b9e6b05
Merge branch 'main' into glob-pathlike-2
barneygale Jan 16, 2024
3eb53bc
Tiny speedup
barneygale Jan 19, 2024
980e4f3
Process pattern as a stack.
barneygale Jan 20, 2024
3e71a3e
Move validation into _pattern_stack
barneygale Jan 20, 2024
0c20f70
Simplify handling of '', '.' and '..' segments in patterns.
barneygale Jan 20, 2024
b500051
Fix tests
barneygale Jan 20, 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
Move validation into _pattern_stack
  • Loading branch information
@barneygale
barneygale committed Jan 20, 2024
commit 3e71a3e715c33841102f13b8d0615ae2ea6a833d
12 changes: 8 additions & 4 deletions Lib/pathlib/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,17 +472,21 @@ def _pattern_stack(self):
"""Stack of path components, to be used with patterns in glob()."""
parts = self._tail.copy()
pattern = self._raw_path
if pattern.endswith('**'):
if self.anchor:
raise NotImplementedError("Non-relative patterns are unsupported")
elif not parts:
raise ValueError("Unacceptable pattern: {!r}".format(pattern))
elif pattern[-1] in (self.pathmod.sep, self.pathmod.altsep):
# GH-65238: pathlib doesn't preserve trailing slash. Add it back.
parts.append('')
elif parts[-1] == '**':
# GH-70303: '**' only matches directories. Add trailing slash.
warnings.warn(
"Pattern ending '**' will match files and directories in a "
"future Python release. Add a trailing slash to match only "
"directories and remove this warning.",
FutureWarning, 4)
parts.append('')
elif pattern[-1] in (self.pathmod.sep, self.pathmod.altsep):
# GH-65238: pathlib doesn't preserve trailing slash. Add it back.
parts.append('')
parts.reverse()
return parts

Expand Down
10 changes: 4 additions & 6 deletions Lib/pathlib/_abc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,10 @@ def is_absolute(self):
@property
def _pattern_stack(self):
"""Stack of path components, to be used with patterns in glob()."""
return self._stack[1]
anchor, parts = self._stack
if anchor:
raise NotImplementedError("Non-relative patterns are unsupported")
return parts

def match(self, path_pattern, *, case_sensitive=None):
"""
Expand Down Expand Up @@ -733,11 +736,6 @@ def glob(self, pattern, *, case_sensitive=None, follow_symlinks=None):
"""
if not isinstance(pattern, PurePathBase):
pattern = self.with_segments(pattern)
if pattern.anchor:
raise NotImplementedError("Non-relative patterns are unsupported")
elif not pattern.parts:
raise ValueError("Unacceptable pattern: {!r}".format(pattern))

if case_sensitive is None:
# TODO: evaluate case-sensitivity of each directory in _select_children().
case_sensitive = _is_case_sensitive(self.pathmod)
Expand Down