Undo modifications to fnmatch.py

barneygale · barneygale · commit 0afcd54884c3 · 2023-02-16T21:06:25.000Z
diff --git a/Lib/fnmatch.py b/Lib/fnmatch.py
@@ -77,11 +77,6 @@ def translate(pat):
     There is no way to quote meta-characters.
     """
 
-    res = _translate(pat)
-    return fr'(?s:{res})\Z'
-
-
-def _translate(pat):
     STAR = object()
     res = []
     add = res.append
@@ -187,4 +182,4 @@ def _translate(pat):
             add(f"(?>.*?{fixed})")
     assert i == n
     res = "".join(res)
-    return res
+    return fr'(?s:{res})\Z'
diff --git a/Lib/pathlib.py b/Lib/pathlib.py
@@ -66,6 +66,8 @@ def _is_wildcard_pattern(pat):
 
 
 _SWAP_SLASH_AND_NEWLINE = str.maketrans({'/': '\n', '\n': '/'})
+_FNMATCH_PADDING = fnmatch.translate('_').split('_')
+_FNMATCH_SLICE = slice(len(_FNMATCH_PADDING[0]), -len(_FNMATCH_PADDING[1]))
 
 
 @functools.lru_cache()
@@ -77,7 +79,7 @@ def _translate(pattern):
     elif '**' in pattern:
         raise ValueError("Invalid pattern: '**' can only be an entire path component")
     else:
-        return fnmatch._translate(pattern)
+        return fnmatch.translate(pattern)[_FNMATCH_SLICE]
 
 
 @functools.lru_cache()
