|
3 | 3 | import logging |
4 | 4 | import os |
5 | 5 | import re |
| 6 | +import sys |
6 | 7 | from distutils import debug, filelist |
7 | 8 | from distutils.errors import DistutilsTemplateError |
8 | 9 | from distutils.filelist import FileList, glob_to_re, translate_pattern |
@@ -45,22 +46,22 @@ def assertWarnings(self, caplog): |
45 | 46 | caplog.clear() |
46 | 47 |
|
47 | 48 | def test_glob_to_re(self): |
48 | | - sep = os.sep |
49 | | - if os.sep == '\\': |
50 | | - sep = re.escape(os.sep) |
| 49 | + sep = re.escape(os.sep) if os.sep == '\\' else os.sep |
| 50 | + # https://docs.python.org/3/whatsnew/3.14.html#re |
| 51 | + end_of_str_metachar = r"\z" if sys.version_info >= (3, 14) else r"\Z" |
51 | 52 |
|
52 | 53 | for glob, regex in ( |
53 | 54 | # simple cases |
54 | | - ('foo*', r'(?s:foo[^%(sep)s]*)\Z'), |
55 | | - ('foo?', r'(?s:foo[^%(sep)s])\Z'), |
56 | | - ('foo??', r'(?s:foo[^%(sep)s][^%(sep)s])\Z'), |
| 55 | + ('foo*', r'(?s:foo[^%(sep)s]*)%(eos)s'), |
| 56 | + ('foo?', r'(?s:foo[^%(sep)s])%(eos)s'), |
| 57 | + ('foo??', r'(?s:foo[^%(sep)s][^%(sep)s])%(eos)s'), |
57 | 58 | # special cases |
58 | | - (r'foo\\*', r'(?s:foo\\\\[^%(sep)s]*)\Z'), |
59 | | - (r'foo\\\*', r'(?s:foo\\\\\\[^%(sep)s]*)\Z'), |
60 | | - ('foo????', r'(?s:foo[^%(sep)s][^%(sep)s][^%(sep)s][^%(sep)s])\Z'), |
61 | | - (r'foo\\??', r'(?s:foo\\\\[^%(sep)s][^%(sep)s])\Z'), |
| 59 | + (r'foo\\*', r'(?s:foo\\\\[^%(sep)s]*)%(eos)s'), |
| 60 | + (r'foo\\\*', r'(?s:foo\\\\\\[^%(sep)s]*)%(eos)s'), |
| 61 | + ('foo????', r'(?s:foo[^%(sep)s][^%(sep)s][^%(sep)s][^%(sep)s])%(eos)s'), |
| 62 | + (r'foo\\??', r'(?s:foo\\\\[^%(sep)s][^%(sep)s])%(eos)s'), |
62 | 63 | ): |
63 | | - regex = regex % {'sep': sep} |
| 64 | + regex = regex % {'sep': sep, 'eos': end_of_str_metachar} |
64 | 65 | assert glob_to_re(glob) == regex |
65 | 66 |
|
66 | 67 | def test_process_template_line(self): |
|
0 commit comments