Skip to content

Commit 00a89bf

Browse files
committed
Delete _globber too.
1 parent 15614a6 commit 00a89bf

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

Lib/pathlib/_abc.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ class PurePathBase:
8181
'_raw_paths',
8282
)
8383
parser = posixpath
84-
_globber = PathGlobber
8584

8685
def __init__(self, *args):
8786
for arg in args:
@@ -321,7 +320,7 @@ def match(self, path_pattern, *, case_sensitive=None):
321320
return False
322321
if len(path_parts) > len(pattern_parts) and path_pattern.anchor:
323322
return False
324-
globber = self._globber(sep, case_sensitive)
323+
globber = PathGlobber(sep, case_sensitive)
325324
for path_part, pattern_part in zip(path_parts, pattern_parts):
326325
match = globber.compile(pattern_part)
327326
if match(path_part) is None:
@@ -337,7 +336,7 @@ def full_match(self, pattern, *, case_sensitive=None):
337336
pattern = self.with_segments(pattern)
338337
if case_sensitive is None:
339338
case_sensitive = _is_case_sensitive(self.parser)
340-
globber = self._globber(pattern.parser.sep, case_sensitive, recursive=True)
339+
globber = PathGlobber(pattern.parser.sep, case_sensitive, recursive=True)
341340
match = globber.compile(str(pattern))
342341
return match(str(self)) is not None
343342

@@ -512,7 +511,7 @@ def glob(self, pattern, *, case_sensitive=None, recurse_symlinks=True):
512511
else:
513512
case_pedantic = True
514513
recursive = True if recurse_symlinks else _no_recurse_symlinks
515-
globber = self._globber(self.parser.sep, case_sensitive, case_pedantic, recursive)
514+
globber = PathGlobber(self.parser.sep, case_sensitive, case_pedantic, recursive)
516515
select = globber.selector(parts)
517516
return select(self)
518517

Lib/pathlib/_local.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ class PurePath(PurePathBase):
101101
'_hash',
102102
)
103103
parser = os.path
104-
_globber = _StringGlobber
105104

106105
def __new__(cls, *args, **kwargs):
107106
"""Construct a PurePath from one or several strings and or existing
@@ -497,7 +496,7 @@ def full_match(self, pattern, *, case_sensitive=None):
497496
# paths shouldn't match wildcards, so we change it to the empty string.
498497
path = str(self) if self.parts else ''
499498
pattern = str(pattern) if pattern.parts else ''
500-
globber = self._globber(self.parser.sep, case_sensitive, recursive=True)
499+
globber = _StringGlobber(self.parser.sep, case_sensitive, recursive=True)
501500
return globber.compile(pattern)(path) is not None
502501

503502
# Subclassing os.PathLike makes isinstance() checks slower,
@@ -743,7 +742,7 @@ def glob(self, pattern, *, case_sensitive=None, recurse_symlinks=False):
743742
case_pedantic = True
744743
parts = self._parse_pattern(pattern)
745744
recursive = True if recurse_symlinks else _no_recurse_symlinks
746-
globber = self._globber(self.parser.sep, case_sensitive, case_pedantic, recursive)
745+
globber = _StringGlobber(self.parser.sep, case_sensitive, case_pedantic, recursive)
747746
select = globber.selector(parts[::-1])
748747
root = str(self)
749748
paths = select(root)

0 commit comments

Comments
 (0)