gh-130942: Fix path seperator matched in character ranges for glob.translate

Lib/fnmatch.py

@@ -87,6 +87,9 @@ def _translate(pat, star, question_mark):
     res = []
     add = res.append
     star_indices = []
+    inside_range = False
+    add_negative_lookahead = False
+    question_mark_char = re.sub(r'\[|\]|\^', '', question_mark)
 
     i, n = 0, len(pat)
     while i < n:
@@ -135,6 +138,9 @@ def _translate(pat, star, question_mark):
                         if chunks[k-1][-1] > chunks[k][0]:
                             chunks[k-1] = chunks[k-1][:-1] + chunks[k][1:]
                             del chunks[k]
+                    if len(chunks)>1:
+                        if question_mark_char:
+                            inside_range = chunks[0][-1] <= question_mark_char <= chunks[-1][0]
                     # Escape backslashes and hyphens for set difference (--).
                     # Hyphens that create ranges shouldn't be escaped.
                     stuff = '-'.join(s.replace('\\', r'\\').replace('-', r'\-')
@@ -145,14 +151,24 @@ def _translate(pat, star, question_mark):
                     add('(?!)')
                 elif stuff == '!':
                     # Negated empty range: match any character.
-                    add('.')
+                    add(question_mark)
                 else:
+                    negative_lookahead=''
+                    if question_mark != '.' and inside_range:
+                        add_negative_lookahead = True
+                        negative_lookahead = negative_lookahead + question_mark_char
                     # Escape set operations (&&, ~~ and ||).
                     stuff = _re_setops_sub(r'\\\1', stuff)
                     if stuff[0] == '!':
+                        if question_mark_char not in stuff and question_mark != '.':
+                            add_negative_lookahead = True
+                            negative_lookahead = negative_lookahead + question_mark_char
                         stuff = '^' + stuff[1:]
-                    elif stuff[0] in ('^', '['):
+                    elif stuff[0] in ('^', '[', question_mark_char):
                         stuff = '\\' + stuff
+                    if add_negative_lookahead:
+                        add(f'(?![{negative_lookahead}])')
+                        add_negative_lookahead = False
                     add(f'[{stuff}]')
         else:
             add(_re_escape(c))

Lib/glob.py

@@ -263,7 +263,6 @@ def escape(pathname):
 _dir_open_flags = os.O_RDONLY | getattr(os, 'O_DIRECTORY', 0)
 _no_recurse_symlinks = object()
 
-
 def translate(pat, *, recursive=False, include_hidden=False, seps=None):
     """Translate a pathname with shell wildcards to a regular expression.
 

Lib/test/test_glob.py

@@ -513,7 +513,14 @@ def fn(pat):
             return glob.translate(pat, recursive=True, include_hidden=True, seps=['/', '\\'])
         self.assertEqual(fn('foo/bar\\baz'), r'(?s:foo[/\\]bar[/\\]baz)\Z')
         self.assertEqual(fn('**/*'), r'(?s:(?:.+[/\\])?[^/\\]+)\Z')
-
+        self.assertEqual(fn('foo[!a]bar'), r'(?s:foo(?![/\\])[^a]bar)\Z')
+        self.assertEqual(fn('foo[%-0]bar'), r'(?s:foo(?![/\\])[%-0]bar)\Z')
+        self.assertEqual(fn('foo[%-0][1-9]bar'), r'(?s:foo(?![/\\])[%-0][1-9]bar)\Z')
+        self.assertEqual(fn('foo[0-%]bar'), r'(?s:foo(?!)bar)\Z')
+        self.assertEqual(fn('foo[^-'), r'(?s:foo\[\^\-)\Z')
+        self.assertEqual(fn('foo[/-/]bar'), r'(?s:foo\[[/\\]\-[/\\]\]bar)\Z')
+        self.assertEqual(fn('foo[%-/]bar'), r'(?s:foo\[%\-[/\\]\]bar)\Z')
+        self.assertEqual(fn('foo[/]bar'), r'(?s:foo\[[/\\]\]bar)\Z')
 
 if __name__ == "__main__":
     unittest.main()

Misc/NEWS.d/next/Library/2025-03-08-23-26-50.gh-issue-130942.jxRMK_.rst

@@ -0,0 +1 @@
+Glob.translate negative-lookaheads path separators regex ranges that ecompass path seperator. For ranges which include path separator literals, the range is escaped.