diff --git a/Lib/pathlib.py b/Lib/pathlib.py
index dee19d1f89ad84..8a1651c23d7f4d 100644
--- a/Lib/pathlib.py
+++ b/Lib/pathlib.py
@@ -54,11 +54,6 @@ def _ignore_error(exception):
getattr(exception, 'winerror', None) in _IGNORED_WINERRORS)
-def _is_wildcard_pattern(pat):
- # Whether this pattern needs actual matching using fnmatch, or can
- # be looked up directly as a file.
- return "*" in pat or "?" in pat or "[" in pat
-
def _is_case_sensitive(flavour):
return flavour.normcase('Aa') == 'Aa'
@@ -78,10 +73,8 @@ def _make_selector(pattern_parts, flavour):
cls = _ParentSelector
elif '**' in pat:
raise ValueError("Invalid pattern: '**' can only be an entire path component")
- elif _is_wildcard_pattern(pat):
- cls = _WildcardSelector
else:
- cls = _PreciseSelector
+ cls = _WildcardSelector
return cls(pat, child_parts, flavour)
@@ -102,17 +95,15 @@ def select_from(self, parent_path):
"""Iterate over all child paths of `parent_path` matched by this
selector. This can contain parent_path itself."""
path_cls = type(parent_path)
- is_dir = path_cls.is_dir
- exists = path_cls.exists
scandir = path_cls._scandir
- if not is_dir(parent_path):
+ if not parent_path.is_dir():
return iter([])
- return self._select_from(parent_path, is_dir, exists, scandir)
+ return self._select_from(parent_path, scandir)
class _TerminatingSelector:
- def _select_from(self, parent_path, is_dir, exists, scandir):
+ def _select_from(self, parent_path, scandir):
yield parent_path
@@ -120,29 +111,12 @@ class _ParentSelector(_Selector):
def __init__(self, name, child_parts, flavour):
_Selector.__init__(self, child_parts, flavour)
- def _select_from(self, parent_path, is_dir, exists, scandir):
+ def _select_from(self, parent_path, scandir):
path = parent_path._make_child_relpath('..')
- for p in self.successor._select_from(path, is_dir, exists, scandir):
+ for p in self.successor._select_from(path, scandir):
yield p
-class _PreciseSelector(_Selector):
-
- def __init__(self, name, child_parts, flavour):
- self.name = name
- _Selector.__init__(self, child_parts, flavour)
-
- def _select_from(self, parent_path, is_dir, exists, scandir):
- try:
- path = parent_path._make_child_relpath(self.name)
- follow = is_dir(path) if self.dironly else exists(path, follow_symlinks=False)
- if follow:
- for p in self.successor._select_from(path, is_dir, exists, scandir):
- yield p
- except PermissionError:
- return
-
-
class _WildcardSelector(_Selector):
def __init__(self, pat, child_parts, flavour):
@@ -150,7 +124,7 @@ def __init__(self, pat, child_parts, flavour):
self.match = re.compile(fnmatch.translate(pat), flags=flags).fullmatch
_Selector.__init__(self, child_parts, flavour)
- def _select_from(self, parent_path, is_dir, exists, scandir):
+ def _select_from(self, parent_path, scandir):
try:
# We must close the scandir() object before proceeding to
# avoid exhausting file descriptors when globbing deep trees.
@@ -171,7 +145,7 @@ def _select_from(self, parent_path, is_dir, exists, scandir):
name = entry.name
if self.match(name):
path = parent_path._make_child_relpath(name)
- for p in self.successor._select_from(path, is_dir, exists, scandir):
+ for p in self.successor._select_from(path, scandir):
yield p
except PermissionError:
return
@@ -182,7 +156,7 @@ class _RecursiveWildcardSelector(_Selector):
def __init__(self, pat, child_parts, flavour):
_Selector.__init__(self, child_parts, flavour)
- def _iterate_directories(self, parent_path, is_dir, scandir):
+ def _iterate_directories(self, parent_path, scandir):
yield parent_path
try:
# We must close the scandir() object before proceeding to
@@ -198,18 +172,18 @@ def _iterate_directories(self, parent_path, is_dir, scandir):
raise
if entry_is_dir and not entry.is_symlink():
path = parent_path._make_child_relpath(entry.name)
- for p in self._iterate_directories(path, is_dir, scandir):
+ for p in self._iterate_directories(path, scandir):
yield p
except PermissionError:
return
- def _select_from(self, parent_path, is_dir, exists, scandir):
+ def _select_from(self, parent_path, scandir):
try:
yielded = set()
try:
successor_select = self.successor._select_from
- for starting_point in self._iterate_directories(parent_path, is_dir, scandir):
- for p in successor_select(starting_point, is_dir, exists, scandir):
+ for starting_point in self._iterate_directories(parent_path, scandir):
+ for p in successor_select(starting_point, scandir):
if p not in yielded:
yield p
yielded.add(p)
diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py
index 620d480e37e2ba..424bb92a87d112 100644
--- a/Lib/test/test_pathlib.py
+++ b/Lib/test/test_pathlib.py
@@ -3122,7 +3122,7 @@ def test_glob(self):
self.assertEqual(set(p.glob("FILEa")), { P(BASE, "fileA") })
self.assertEqual(set(p.glob("*a\\")), { P(BASE, "dirA") })
self.assertEqual(set(p.glob("F*a")), { P(BASE, "fileA") })
- self.assertEqual(set(map(str, p.glob("FILEa"))), {f"{p}\\FILEa"})
+ self.assertEqual(set(map(str, p.glob("FILEa"))), {f"{p}\\fileA"})
self.assertEqual(set(map(str, p.glob("F*a"))), {f"{p}\\fileA"})
def test_rglob(self):
@@ -3130,7 +3130,7 @@ def test_rglob(self):
p = P(BASE, "dirC")
self.assertEqual(set(p.rglob("FILEd")), { P(BASE, "dirC/dirD/fileD") })
self.assertEqual(set(p.rglob("*\\")), { P(BASE, "dirC/dirD") })
- self.assertEqual(set(map(str, p.rglob("FILEd"))), {f"{p}\\dirD\\FILEd"})
+ self.assertEqual(set(map(str, p.rglob("FILEd"))), {f"{p}\\dirD\\fileD"})
def test_expanduser(self):
P = self.cls
diff --git a/Misc/NEWS.d/next/Library/2023-05-03-03-14-33.gh-issue-104114.RG26RD.rst b/Misc/NEWS.d/next/Library/2023-05-03-03-14-33.gh-issue-104114.RG26RD.rst
new file mode 100644
index 00000000000000..e705fea8326e7a
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-05-03-03-14-33.gh-issue-104114.RG26RD.rst
@@ -0,0 +1,3 @@
+Fix issue where :meth:`pathlib.Path.glob` returns paths using the case of
+non-wildcard segments for corresponding path segments, rather than the real
+filesystem case.
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy