Refine testcases and and escape ranges including path separator literals.

Author: dmitrin9

Lib/fnmatch.py

@@ -87,7 +87,9 @@ def _translate(pat, star, question_mark):
     res = []
     add = res.append
     star_indices = []
-    inside_range=False
+    inside_range = False
+    add_negative_lookahead = False
+    question_mark_char = re.sub(r'\[|\]|\^', '', question_mark)
 
     i, n = 0, len(pat)
     while i < n:
@@ -136,21 +138,13 @@ 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:
-                        char_range=set(range(ord(chunks[0][-1]), ord(chunks[-1][0])))
-
-                        question_mark_char=question_mark.replace('\\', '').replace('[', '').replace(']', '').replace('^', '')
-                        question_mark_char=set(map(ord, question_mark_char))
-
-                        if question_mark_char.intersection(char_range):
-                            inside_range=True
-
+                        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'\-')
                                      for s in chunks)
-
                 i = j+1
                 if not stuff:
                     # Empty range: never match.
@@ -159,14 +153,22 @@ def _translate(pat, star, question_mark):
                     # Negated empty range: match any character.
                     add(question_mark)
                 else:
+                    negative_lookahead=''
                     if question_mark != '.' and inside_range:
-                        add(f'(?={question_mark})')
+                        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

@@ -281,8 +281,6 @@ def translate(pat, *, recursive=False, include_hidden=False, seps=None):
             seps = (os.path.sep, os.path.altsep)
         else:
             seps = os.path.sep
-
-
     escaped_seps = ''.join(map(re.escape, seps))
     any_sep = f'[{escaped_seps}]' if len(seps) > 1 else escaped_seps
     not_sep = f'[^{escaped_seps}]'
@@ -313,12 +311,9 @@ def translate(pat, *, recursive=False, include_hidden=False, seps=None):
             if part:
                 if not include_hidden and part[0] in '*?':
                     results.append(r'(?!\.)')
-
                 results.extend(fnmatch._translate(part, f'{not_sep}*', not_sep)[0])
-
             if idx < last_part_idx:
                 results.append(any_sep)
-
     res = ''.join(results)
     return fr'(?s:{res})\Z'
 

Lib/test/test_glob.py

@@ -513,9 +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[%-0]bar'), r'(?s:foo(?=[^/\\])[%-0]bar)\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()