Merge branch 'main' into gh-81079-glob-case-sensitive-arg-2

python · barneygale · May 4, 2023 · Mar 15, 2023 · Mar 22, 2023 · Mar 27, 2023
commit c411cfacb54d610756f9da4c5987e8ff98d49fd1
diff --git a/Lib/pathlib.py b/Lib/pathlib.py
@@ -53,13 +53,18 @@ def _ignore_error(exception):
     return (getattr(exception, 'errno', None) in _IGNORED_ERRNOS or
             getattr(exception, 'winerror', None) in _IGNORED_WINERRORS)
 
-#
-# Globbing helpers
-#
+
+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'
 
+#
+# Globbing helpers
+#
 
 @functools.lru_cache()
 def _make_selector(pattern_parts, case_sensitive):
@@ -73,8 +78,6 @@ def _make_selector(pattern_parts, case_sensitive):
         cls = _ParentSelector
     elif '**' in pat:
         raise ValueError("Invalid pattern: '**' can only be an entire path component")
-    elif pat == '..':
-        cls = _ParentSelector
     else:
         cls = _WildcardSelector
     return cls(pat, child_parts, case_sensitive)
@@ -114,9 +117,10 @@ class _ParentSelector(_Selector):
     def __init__(self, name, child_parts, case_sensitive):
         _Selector.__init__(self, child_parts, case_sensitive)
 
-    def _select_from(self, parent_path, scandir):
+    def _select_from(self,  parent_path, scandir):
         path = parent_path._make_child_relpath('..')
-        return self.successor._select_from(path, scandir)
+        for p in self.successor._select_from(path, scandir):
+            yield p
 
 
 class _WildcardSelector(_Selector):