Merge pull request #146 from jaraco/debt/backport-gh-133337

jaraco · web-flow · commit 5b5725d143f7 · 2025-06-08T13:00:19.000-04:00
Backport use of `\z` in glob.
diff --git a/.coveragerc b/.coveragerc
@@ -2,6 +2,7 @@
 omit =
 	# leading `*/` for pytest-dev/pytest-cov#456
 	*/.tox/*
+	zipp/compat/py313.py
 disable_warnings =
 	couldnt-parse
 
diff --git a/newsfragments/145.feature.rst b/newsfragments/145.feature.rst
@@ -0,0 +1 @@
+Add a compatibility shim for Python 3.13 and earlier.
diff --git a/zipp/compat/py313.py b/zipp/compat/py313.py
@@ -0,0 +1,34 @@
+import functools
+import sys
+
+
+# from jaraco.functools 4.1
+def identity(x):
+    return x
+
+
+# from jaraco.functools 4.1
+def apply(transform):
+    def wrap(func):
+        return functools.wraps(func)(compose(transform, func))
+
+    return wrap
+
+
+# from jaraco.functools 4.1
+def compose(*funcs):
+    def compose_two(f1, f2):
+        return lambda *args, **kwargs: f1(f2(*args, **kwargs))
+
+    return functools.reduce(compose_two, funcs)
+
+
+def replace(pattern):
+    r"""
+    >>> replace(r'foo\z')
+    'foo\\Z'
+    """
+    return pattern[:-2] + pattern[-2:].replace(r'\z', r'\Z')
+
+
+legacy_end_marker = apply(replace) if sys.version_info < (3, 14) else identity
diff --git a/zipp/glob.py b/zipp/glob.py
@@ -1,6 +1,8 @@
 import os
 import re
 
+from .compat.py313 import legacy_end_marker
+
 _default_seps = os.sep + str(os.altsep) * bool(os.altsep)
 
 
@@ -29,16 +31,17 @@ def translate(self, pattern):
         """
         return self.extend(self.match_dirs(self.translate_core(pattern)))
 
+    @legacy_end_marker
     def extend(self, pattern):
         r"""
         Extend regex for pattern-wide concerns.
 
         Apply '(?s:)' to create a non-matching group that
         matches newlines (valid on Unix).
 
-        Append '\Z' to imply fullmatch even when match is used.
+        Append '\z' to imply fullmatch even when match is used.
         """
-        return rf'(?s:{pattern})\Z'
+        return rf'(?s:{pattern})\z'
 
     def match_dirs(self, pattern):
         """

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Add a compatibility shim for Python 3.13 and earlier.`