Skip to content

Commit add0ca9

Browse files
serhiy-storchakaserhiy-storchaka
authored
gh-133306: Use \z instead of \Z in fnmatch.translate() and glob.translate() (GH-133338)
1 parent cb31741 commit add0ca9

File tree

7 files changed

+96
-94
lines changed

7 files changed

+96
-94
lines changed

‎Doc/library/fnmatch.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ functions: :func:`fnmatch`, :func:`fnmatchcase`, :func:`.filter`.
111111
>>>
112112
>>> regex = fnmatch.translate('*.txt')
113113
>>> regex
114-
'(?s:.*\\.txt)\\Z'
114+
'(?s:.*\\.txt)\\z'
115115
>>> reobj = re.compile(regex)
116116
>>> reobj.match('foobar.txt')
117117
<re.Match object; span=(0, 10), match='foobar.txt'>

‎Doc/library/glob.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ The :mod:`glob` module defines the following functions:
134134
>>>
135135
>>> regex = glob.translate('**/*.txt', recursive=True, include_hidden=True)
136136
>>> regex
137-
'(?s:(?:.+/)?[^/]*\\.txt)\\Z'
137+
'(?s:(?:.+/)?[^/]*\\.txt)\\z'
138138
>>> reobj = re.compile(regex)
139139
>>> reobj.match('foo/bar/baz.txt')
140140
<re.Match object; span=(0, 15), match='foo/bar/baz.txt'>

‎Lib/fnmatch.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def _translate(pat, star, question_mark):
185185

186186
def _join_translated_parts(parts, star_indices):
187187
if not star_indices:
188-
return fr'(?s:{"".join(parts)})\Z'
188+
return fr'(?s:{"".join(parts)})\z'
189189
iter_star_indices = iter(star_indices)
190190
j = next(iter_star_indices)
191191
buffer = parts[:j] # fixed pieces at the start
@@ -206,4 +206,4 @@ def _join_translated_parts(parts, star_indices):
206206
append('.*')
207207
extend(parts[i:])
208208
res = ''.join(buffer)
209-
return fr'(?s:{res})\Z'
209+
return fr'(?s:{res})\z'

‎Lib/glob.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ def translate(pat, *, recursive=False, include_hidden=False, seps=None):
316316
if idx < last_part_idx:
317317
results.append(any_sep)
318318
res = ''.join(results)
319-
return fr'(?s:{res})\Z'
319+
return fr'(?s:{res})\z'
320320

321321

322322
@functools.lru_cache(maxsize=512)

‎Lib/test/test_fnmatch.py

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -218,24 +218,24 @@ class TranslateTestCase(unittest.TestCase):
218218

219219
def test_translate(self):
220220
import re
221-
self.assertEqual(translate('*'), r'(?s:.*)\Z')
222-
self.assertEqual(translate('?'), r'(?s:.)\Z')
223-
self.assertEqual(translate('a?b*'), r'(?s:a.b.*)\Z')
224-
self.assertEqual(translate('[abc]'), r'(?s:[abc])\Z')
225-
self.assertEqual(translate('[]]'), r'(?s:[]])\Z')
226-
self.assertEqual(translate('[!x]'), r'(?s:[^x])\Z')
227-
self.assertEqual(translate('[^x]'), r'(?s:[\^x])\Z')
228-
self.assertEqual(translate('[x'), r'(?s:\[x)\Z')
221+
self.assertEqual(translate('*'), r'(?s:.*)\z')
222+
self.assertEqual(translate('?'), r'(?s:.)\z')
223+
self.assertEqual(translate('a?b*'), r'(?s:a.b.*)\z')
224+
self.assertEqual(translate('[abc]'), r'(?s:[abc])\z')
225+
self.assertEqual(translate('[]]'), r'(?s:[]])\z')
226+
self.assertEqual(translate('[!x]'), r'(?s:[^x])\z')
227+
self.assertEqual(translate('[^x]'), r'(?s:[\^x])\z')
228+
self.assertEqual(translate('[x'), r'(?s:\[x)\z')
229229
# from the docs
230-
self.assertEqual(translate('*.txt'), r'(?s:.*\.txt)\Z')
230+
self.assertEqual(translate('*.txt'), r'(?s:.*\.txt)\z')
231231
# squash consecutive stars
232-
self.assertEqual(translate('*********'), r'(?s:.*)\Z')
233-
self.assertEqual(translate('A*********'), r'(?s:A.*)\Z')
234-
self.assertEqual(translate('*********A'), r'(?s:.*A)\Z')
235-
self.assertEqual(translate('A*********?[?]?'), r'(?s:A.*.[?].)\Z')
232+
self.assertEqual(translate('*********'), r'(?s:.*)\z')
233+
self.assertEqual(translate('A*********'), r'(?s:A.*)\z')
234+
self.assertEqual(translate('*********A'), r'(?s:.*A)\z')
235+
self.assertEqual(translate('A*********?[?]?'), r'(?s:A.*.[?].)\z')
236236
# fancy translation to prevent exponential-time match failure
237237
t = translate('**a*a****a')
238-
self.assertEqual(t, r'(?s:(?>.*?a)(?>.*?a).*a)\Z')
238+
self.assertEqual(t, r'(?s:(?>.*?a)(?>.*?a).*a)\z')
239239
# and try pasting multiple translate results - it's an undocumented
240240
# feature that this works
241241
r1 = translate('**a**a**a*')
@@ -249,56 +249,56 @@ def test_translate(self):
249249

250250
def test_translate_wildcards(self):
251251
for pattern, expect in [
252-
('ab*', r'(?s:ab.*)\Z'),
253-
('ab*cd', r'(?s:ab.*cd)\Z'),
254-
('ab*cd*', r'(?s:ab(?>.*?cd).*)\Z'),
255-
('ab*cd*12', r'(?s:ab(?>.*?cd).*12)\Z'),
256-
('ab*cd*12*', r'(?s:ab(?>.*?cd)(?>.*?12).*)\Z'),
257-
('ab*cd*12*34', r'(?s:ab(?>.*?cd)(?>.*?12).*34)\Z'),
258-
('ab*cd*12*34*', r'(?s:ab(?>.*?cd)(?>.*?12)(?>.*?34).*)\Z'),
252+
('ab*', r'(?s:ab.*)\z'),
253+
('ab*cd', r'(?s:ab.*cd)\z'),
254+
('ab*cd*', r'(?s:ab(?>.*?cd).*)\z'),
255+
('ab*cd*12', r'(?s:ab(?>.*?cd).*12)\z'),
256+
('ab*cd*12*', r'(?s:ab(?>.*?cd)(?>.*?12).*)\z'),
257+
('ab*cd*12*34', r'(?s:ab(?>.*?cd)(?>.*?12).*34)\z'),
258+
('ab*cd*12*34*', r'(?s:ab(?>.*?cd)(?>.*?12)(?>.*?34).*)\z'),
259259
]:
260260
with self.subTest(pattern):
261261
translated = translate(pattern)
262262
self.assertEqual(translated, expect, pattern)
263263

264264
for pattern, expect in [
265-
('*ab', r'(?s:.*ab)\Z'),
266-
('*ab*', r'(?s:(?>.*?ab).*)\Z'),
267-
('*ab*cd', r'(?s:(?>.*?ab).*cd)\Z'),
268-
('*ab*cd*', r'(?s:(?>.*?ab)(?>.*?cd).*)\Z'),
269-
('*ab*cd*12', r'(?s:(?>.*?ab)(?>.*?cd).*12)\Z'),
270-
('*ab*cd*12*', r'(?s:(?>.*?ab)(?>.*?cd)(?>.*?12).*)\Z'),
271-
('*ab*cd*12*34', r'(?s:(?>.*?ab)(?>.*?cd)(?>.*?12).*34)\Z'),
272-
('*ab*cd*12*34*', r'(?s:(?>.*?ab)(?>.*?cd)(?>.*?12)(?>.*?34).*)\Z'),
265+
('*ab', r'(?s:.*ab)\z'),
266+
('*ab*', r'(?s:(?>.*?ab).*)\z'),
267+
('*ab*cd', r'(?s:(?>.*?ab).*cd)\z'),
268+
('*ab*cd*', r'(?s:(?>.*?ab)(?>.*?cd).*)\z'),
269+
('*ab*cd*12', r'(?s:(?>.*?ab)(?>.*?cd).*12)\z'),
270+
('*ab*cd*12*', r'(?s:(?>.*?ab)(?>.*?cd)(?>.*?12).*)\z'),
271+
('*ab*cd*12*34', r'(?s:(?>.*?ab)(?>.*?cd)(?>.*?12).*34)\z'),
272+
('*ab*cd*12*34*', r'(?s:(?>.*?ab)(?>.*?cd)(?>.*?12)(?>.*?34).*)\z'),
273273
]:
274274
with self.subTest(pattern):
275275
translated = translate(pattern)
276276
self.assertEqual(translated, expect, pattern)
277277

278278
def test_translate_expressions(self):
279279
for pattern, expect in [
280-
('[', r'(?s:\[)\Z'),
281-
('[!', r'(?s:\[!)\Z'),
282-
('[]', r'(?s:\[\])\Z'),
283-
('[abc', r'(?s:\[abc)\Z'),
284-
('[!abc', r'(?s:\[!abc)\Z'),
285-
('[abc]', r'(?s:[abc])\Z'),
286-
('[!abc]', r'(?s:[^abc])\Z'),
287-
('[!abc][!def]', r'(?s:[^abc][^def])\Z'),
280+
('[', r'(?s:\[)\z'),
281+
('[!', r'(?s:\[!)\z'),
282+
('[]', r'(?s:\[\])\z'),
283+
('[abc', r'(?s:\[abc)\z'),
284+
('[!abc', r'(?s:\[!abc)\z'),
285+
('[abc]', r'(?s:[abc])\z'),
286+
('[!abc]', r'(?s:[^abc])\z'),
287+
('[!abc][!def]', r'(?s:[^abc][^def])\z'),
288288
# with [[
289-
('[[', r'(?s:\[\[)\Z'),
290-
('[[a', r'(?s:\[\[a)\Z'),
291-
('[[]', r'(?s:[\[])\Z'),
292-
('[[]a', r'(?s:[\[]a)\Z'),
293-
('[[]]', r'(?s:[\[]\])\Z'),
294-
('[[]a]', r'(?s:[\[]a\])\Z'),
295-
('[[a]', r'(?s:[\[a])\Z'),
296-
('[[a]]', r'(?s:[\[a]\])\Z'),
297-
('[[a]b', r'(?s:[\[a]b)\Z'),
289+
('[[', r'(?s:\[\[)\z'),
290+
('[[a', r'(?s:\[\[a)\z'),
291+
('[[]', r'(?s:[\[])\z'),
292+
('[[]a', r'(?s:[\[]a)\z'),
293+
('[[]]', r'(?s:[\[]\])\z'),
294+
('[[]a]', r'(?s:[\[]a\])\z'),
295+
('[[a]', r'(?s:[\[a])\z'),
296+
('[[a]]', r'(?s:[\[a]\])\z'),
297+
('[[a]b', r'(?s:[\[a]b)\z'),
298298
# backslashes
299-
('[\\', r'(?s:\[\\)\Z'),
300-
(r'[\]', r'(?s:[\\])\Z'),
301-
(r'[\\]', r'(?s:[\\\\])\Z'),
299+
('[\\', r'(?s:\[\\)\z'),
300+
(r'[\]', r'(?s:[\\])\z'),
301+
(r'[\\]', r'(?s:[\\\\])\z'),
302302
]:
303303
with self.subTest(pattern):
304304
translated = translate(pattern)

‎Lib/test/test_glob.py

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -459,59 +459,59 @@ def test_translate_matching(self):
459459
def test_translate(self):
460460
def fn(pat):
461461
return glob.translate(pat, seps='/')
462-
self.assertEqual(fn('foo'), r'(?s:foo)\Z')
463-
self.assertEqual(fn('foo/bar'), r'(?s:foo/bar)\Z')
464-
self.assertEqual(fn('*'), r'(?s:[^/.][^/]*)\Z')
465-
self.assertEqual(fn('?'), r'(?s:(?!\.)[^/])\Z')
466-
self.assertEqual(fn('a*'), r'(?s:a[^/]*)\Z')
467-
self.assertEqual(fn('*a'), r'(?s:(?!\.)[^/]*a)\Z')
468-
self.assertEqual(fn('.*'), r'(?s:\.[^/]*)\Z')
469-
self.assertEqual(fn('?aa'), r'(?s:(?!\.)[^/]aa)\Z')
470-
self.assertEqual(fn('aa?'), r'(?s:aa[^/])\Z')
471-
self.assertEqual(fn('aa[ab]'), r'(?s:aa[ab])\Z')
472-
self.assertEqual(fn('**'), r'(?s:(?!\.)[^/]*)\Z')
473-
self.assertEqual(fn('***'), r'(?s:(?!\.)[^/]*)\Z')
474-
self.assertEqual(fn('a**'), r'(?s:a[^/]*)\Z')
475-
self.assertEqual(fn('**b'), r'(?s:(?!\.)[^/]*b)\Z')
462+
self.assertEqual(fn('foo'), r'(?s:foo)\z')
463+
self.assertEqual(fn('foo/bar'), r'(?s:foo/bar)\z')
464+
self.assertEqual(fn('*'), r'(?s:[^/.][^/]*)\z')
465+
self.assertEqual(fn('?'), r'(?s:(?!\.)[^/])\z')
466+
self.assertEqual(fn('a*'), r'(?s:a[^/]*)\z')
467+
self.assertEqual(fn('*a'), r'(?s:(?!\.)[^/]*a)\z')
468+
self.assertEqual(fn('.*'), r'(?s:\.[^/]*)\z')
469+
self.assertEqual(fn('?aa'), r'(?s:(?!\.)[^/]aa)\z')
470+
self.assertEqual(fn('aa?'), r'(?s:aa[^/])\z')
471+
self.assertEqual(fn('aa[ab]'), r'(?s:aa[ab])\z')
472+
self.assertEqual(fn('**'), r'(?s:(?!\.)[^/]*)\z')
473+
self.assertEqual(fn('***'), r'(?s:(?!\.)[^/]*)\z')
474+
self.assertEqual(fn('a**'), r'(?s:a[^/]*)\z')
475+
self.assertEqual(fn('**b'), r'(?s:(?!\.)[^/]*b)\z')
476476
self.assertEqual(fn('/**/*/*.*/**'),
477-
r'(?s:/(?!\.)[^/]*/[^/.][^/]*/(?!\.)[^/]*\.[^/]*/(?!\.)[^/]*)\Z')
477+
r'(?s:/(?!\.)[^/]*/[^/.][^/]*/(?!\.)[^/]*\.[^/]*/(?!\.)[^/]*)\z')
478478

479479
def test_translate_include_hidden(self):
480480
def fn(pat):
481481
return glob.translate(pat, include_hidden=True, seps='/')
482-
self.assertEqual(fn('foo'), r'(?s:foo)\Z')
483-
self.assertEqual(fn('foo/bar'), r'(?s:foo/bar)\Z')
484-
self.assertEqual(fn('*'), r'(?s:[^/]+)\Z')
485-
self.assertEqual(fn('?'), r'(?s:[^/])\Z')
486-
self.assertEqual(fn('a*'), r'(?s:a[^/]*)\Z')
487-
self.assertEqual(fn('*a'), r'(?s:[^/]*a)\Z')
488-
self.assertEqual(fn('.*'), r'(?s:\.[^/]*)\Z')
489-
self.assertEqual(fn('?aa'), r'(?s:[^/]aa)\Z')
490-
self.assertEqual(fn('aa?'), r'(?s:aa[^/])\Z')
491-
self.assertEqual(fn('aa[ab]'), r'(?s:aa[ab])\Z')
492-
self.assertEqual(fn('**'), r'(?s:[^/]*)\Z')
493-
self.assertEqual(fn('***'), r'(?s:[^/]*)\Z')
494-
self.assertEqual(fn('a**'), r'(?s:a[^/]*)\Z')
495-
self.assertEqual(fn('**b'), r'(?s:[^/]*b)\Z')
496-
self.assertEqual(fn('/**/*/*.*/**'), r'(?s:/[^/]*/[^/]+/[^/]*\.[^/]*/[^/]*)\Z')
482+
self.assertEqual(fn('foo'), r'(?s:foo)\z')
483+
self.assertEqual(fn('foo/bar'), r'(?s:foo/bar)\z')
484+
self.assertEqual(fn('*'), r'(?s:[^/]+)\z')
485+
self.assertEqual(fn('?'), r'(?s:[^/])\z')
486+
self.assertEqual(fn('a*'), r'(?s:a[^/]*)\z')
487+
self.assertEqual(fn('*a'), r'(?s:[^/]*a)\z')
488+
self.assertEqual(fn('.*'), r'(?s:\.[^/]*)\z')
489+
self.assertEqual(fn('?aa'), r'(?s:[^/]aa)\z')
490+
self.assertEqual(fn('aa?'), r'(?s:aa[^/])\z')
491+
self.assertEqual(fn('aa[ab]'), r'(?s:aa[ab])\z')
492+
self.assertEqual(fn('**'), r'(?s:[^/]*)\z')
493+
self.assertEqual(fn('***'), r'(?s:[^/]*)\z')
494+
self.assertEqual(fn('a**'), r'(?s:a[^/]*)\z')
495+
self.assertEqual(fn('**b'), r'(?s:[^/]*b)\z')
496+
self.assertEqual(fn('/**/*/*.*/**'), r'(?s:/[^/]*/[^/]+/[^/]*\.[^/]*/[^/]*)\z')
497497

498498
def test_translate_recursive(self):
499499
def fn(pat):
500500
return glob.translate(pat, recursive=True, include_hidden=True, seps='/')
501-
self.assertEqual(fn('*'), r'(?s:[^/]+)\Z')
502-
self.assertEqual(fn('?'), r'(?s:[^/])\Z')
503-
self.assertEqual(fn('**'), r'(?s:.*)\Z')
504-
self.assertEqual(fn('**/**'), r'(?s:.*)\Z')
505-
self.assertEqual(fn('***'), r'(?s:[^/]*)\Z')
506-
self.assertEqual(fn('a**'), r'(?s:a[^/]*)\Z')
507-
self.assertEqual(fn('**b'), r'(?s:[^/]*b)\Z')
508-
self.assertEqual(fn('/**/*/*.*/**'), r'(?s:/(?:.+/)?[^/]+/[^/]*\.[^/]*/.*)\Z')
501+
self.assertEqual(fn('*'), r'(?s:[^/]+)\z')
502+
self.assertEqual(fn('?'), r'(?s:[^/])\z')
503+
self.assertEqual(fn('**'), r'(?s:.*)\z')
504+
self.assertEqual(fn('**/**'), r'(?s:.*)\z')
505+
self.assertEqual(fn('***'), r'(?s:[^/]*)\z')
506+
self.assertEqual(fn('a**'), r'(?s:a[^/]*)\z')
507+
self.assertEqual(fn('**b'), r'(?s:[^/]*b)\z')
508+
self.assertEqual(fn('/**/*/*.*/**'), r'(?s:/(?:.+/)?[^/]+/[^/]*\.[^/]*/.*)\z')
509509

510510
def test_translate_seps(self):
511511
def fn(pat):
512512
return glob.translate(pat, recursive=True, include_hidden=True, seps=['/', '\\'])
513-
self.assertEqual(fn('foo/bar\\baz'), r'(?s:foo[/\\]bar[/\\]baz)\Z')
514-
self.assertEqual(fn('**/*'), r'(?s:(?:.+[/\\])?[^/\\]+)\Z')
513+
self.assertEqual(fn('foo/bar\\baz'), r'(?s:foo[/\\]bar[/\\]baz)\z')
514+
self.assertEqual(fn('**/*'), r'(?s:(?:.+[/\\])?[^/\\]+)\z')
515515

516516

517517
if __name__ == "__main__":

‎Misc/NEWS.d/next/Library/2025-05-03-13-19-22.gh-issue-133306.ustKV3.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Use ``\z`` instead of ``\Z`` in :func:`fnmatch.translate` and
2+
:func:`glob.translate`.

0 commit comments

Comments
 (0)