Skip to content

GH-81079: Add case_sensitive argument to pathlib.Path.glob() #102710

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 13 commits into from
May 4, 2023
Merged

GH-81079: Add case_sensitive argument to pathlib.Path.glob() #102710

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b0d836e
GH-81079: Add case_sensitive argument to pathlib.Path.glob()
barneygale Mar 15, 2023
e386a54
Merge branch 'main' into gh-81079-glob-case-sensitive-arg-2
barneygale Mar 22, 2023
29cdbee
Merge branch 'main' into gh-81079-glob-case-sensitive-arg-2
barneygale Mar 27, 2023
ac1fe16
Merge branch 'main' into gh-81079-glob-case-sensitive-arg-2
barneygale Apr 29, 2023
dc82494
Describe behaviour when case_sensitive is None.
barneygale May 2, 2023
c411cfa
Merge branch 'main' into gh-81079-glob-case-sensitive-arg-2
barneygale May 2, 2023
d097f8c
Restore `_PreciseSelector`
barneygale May 2, 2023
33b435d
Revert "Restore `_PreciseSelector`"
barneygale May 3, 2023
203e734
Remove unused `_is_wildcard_pattern()` function
barneygale May 3, 2023
37d2e20
Merge branch 'main' into gh-81079-glob-case-sensitive-arg-2
barneygale May 3, 2023
2146b2b
Update Doc/library/pathlib.rst
barneygale May 3, 2023
b2c4b47
Pass flavour to selector initialiser
barneygale May 4, 2023
0d697ad
Improve consistency between glob() and rglob() docs
barneygale May 4, 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
Next Next commit
Pass flavour to selector initialiser
  • Loading branch information
@barneygale
barneygale committed May 4, 2023
commit b2c4b47b5e746c2254e28580ffdb5866dabee4d7
31 changes: 15 additions & 16 deletions Lib/pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def _is_case_sensitive(flavour):
#

@functools.lru_cache()
def _make_selector(pattern_parts, case_sensitive):
def _make_selector(pattern_parts, flavour, case_sensitive):
pat = pattern_parts[0]
child_parts = pattern_parts[1:]
if not pat:
Expand All @@ -75,17 +75,17 @@ def _make_selector(pattern_parts, case_sensitive):
raise ValueError("Invalid pattern: '**' can only be an entire path component")
else:
cls = _WildcardSelector
return cls(pat, child_parts, case_sensitive)
return cls(pat, child_parts, flavour, case_sensitive)


class _Selector:
"""A selector matches a specific glob pattern part against the children
of a given path."""

def __init__(self, child_parts, case_sensitive):
def __init__(self, child_parts, flavour, case_sensitive):
self.child_parts = child_parts
if child_parts:
self.successor = _make_selector(child_parts, case_sensitive)
self.successor = _make_selector(child_parts, flavour, case_sensitive)
self.dironly = True
else:
self.successor = _TerminatingSelector()
Expand All @@ -109,8 +109,8 @@ def _select_from(self, parent_path, scandir):

class _ParentSelector(_Selector):

def __init__(self, name, child_parts, case_sensitive):
_Selector.__init__(self, child_parts, case_sensitive)
def __init__(self, name, child_parts, flavour, case_sensitive):
_Selector.__init__(self, child_parts, flavour, case_sensitive)

def _select_from(self, parent_path, scandir):
path = parent_path._make_child_relpath('..')
Expand All @@ -120,10 +120,13 @@ def _select_from(self, parent_path, scandir):

class _WildcardSelector(_Selector):

def __init__(self, pat, child_parts, case_sensitive):
def __init__(self, pat, child_parts, flavour, case_sensitive):
_Selector.__init__(self, child_parts, flavour, case_sensitive)
if case_sensitive is None:
# TODO: evaluate case-sensitivity of each directory in _select_from()
case_sensitive = _is_case_sensitive(flavour)
flags = re.NOFLAG if case_sensitive else re.IGNORECASE
Comment thread
zooba marked this conversation as resolved.
self.match = re.compile(fnmatch.translate(pat), flags=flags).fullmatch
_Selector.__init__(self, child_parts, case_sensitive)

def _select_from(self, parent_path, scandir):
try:
Expand Down Expand Up @@ -154,8 +157,8 @@ def _select_from(self, parent_path, scandir):

class _RecursiveWildcardSelector(_Selector):

def __init__(self, pat, child_parts, case_sensitive):
_Selector.__init__(self, child_parts, case_sensitive)
def __init__(self, pat, child_parts, flavour, case_sensitive):
_Selector.__init__(self, child_parts, flavour, case_sensitive)

def _iterate_directories(self, parent_path, scandir):
yield parent_path
Expand Down Expand Up @@ -832,9 +835,7 @@ def glob(self, pattern, *, case_sensitive=None):
raise NotImplementedError("Non-relative patterns are unsupported")
if pattern[-1] in (self._flavour.sep, self._flavour.altsep):
pattern_parts.append('')
if case_sensitive is None:
case_sensitive = _is_case_sensitive(self._flavour)
selector = _make_selector(tuple(pattern_parts), case_sensitive)
selector = _make_selector(tuple(pattern_parts), self._flavour, case_sensitive)
for p in selector.select_from(self):
yield p

Expand All @@ -849,9 +850,7 @@ def rglob(self, pattern, *, case_sensitive=None):
raise NotImplementedError("Non-relative patterns are unsupported")
if pattern and pattern[-1] in (self._flavour.sep, self._flavour.altsep):
pattern_parts.append('')
if case_sensitive is None:
case_sensitive = _is_case_sensitive(self._flavour)
selector = _make_selector(("**",) + tuple(pattern_parts), case_sensitive)
selector = _make_selector(("**",) + tuple(pattern_parts), self._flavour, case_sensitive)
for p in selector.select_from(self):
yield p

Expand Down