Merge pull request #142 from jaraco/backport-gh-123429

jaraco · web-flow · commit 73cdd55631a6 · 2025-05-26T09:30:10.000-04:00
Backport python/cpython#123429
diff --git a/newsfragments/142.feature.rst b/newsfragments/142.feature.rst
@@ -0,0 +1 @@
+Backported simplified tests from python/cpython#123424.
diff --git a/tests/compat/py313.py b/tests/compat/py313.py
@@ -0,0 +1,33 @@
+import os
+import sys
+import time
+
+
+def _for_archive(self, archive):
+    """Resolve suitable defaults from the archive.
+
+    Resolve the date_time, compression attributes, and external attributes
+    to suitable defaults as used by :method:`ZipFile.writestr`.
+
+    Return self.
+    """
+    # gh-91279: Set the SOURCE_DATE_EPOCH to a specific timestamp
+    epoch = os.environ.get('SOURCE_DATE_EPOCH')
+    get_time = int(epoch) if epoch else time.time()
+    self.date_time = time.localtime(get_time)[:6]
+
+    self.compress_type = archive.compression
+    self.compress_level = archive.compresslevel
+    if self.filename.endswith('/'):  # pragma: no cover
+        self.external_attr = 0o40775 << 16  # drwxrwxr-x
+        self.external_attr |= 0x10  # MS-DOS directory flag
+    else:
+        self.external_attr = 0o600 << 16  # ?rw-------
+    return self
+
+
+ForArchive = type(
+    'ForArchive',
+    (),
+    dict(_for_archive=_for_archive) if sys.version_info < (3, 14) else dict(),
+)
diff --git a/tests/test_path.py b/tests/test_path.py
@@ -5,7 +5,6 @@
 import pickle
 import stat
 import sys
-import time
 import unittest
 
 import jaraco.itertools
@@ -15,6 +14,7 @@
 
 from ._test_params import Invoked, parameterize
 from .compat.py39.os_helper import FakePath, temp_dir  # type: ignore[import-not-found]
+from .compat.py313 import ForArchive
 
 
 def _make_link(info: zipfile.ZipInfo):  # type: ignore[name-defined]
@@ -628,7 +628,7 @@ def test_backslash_not_separator(self):
         """
         data = io.BytesIO()
         zf = zipfile.ZipFile(data, "w")
-        zf.writestr(DirtyZipInfo.for_name("foo\\bar", zf), b"content")
+        zf.writestr(DirtyZipInfo("foo\\bar")._for_archive(zf), b"content")
         zf.filename = ''
         root = zipfile.Path(zf)
         (first,) = root.iterdir()
@@ -643,28 +643,11 @@ def test_interface(self, alpharep):
         assert isinstance(zf, Traversable)
 
 
-class DirtyZipInfo(zipfile.ZipInfo):
+class DirtyZipInfo(zipfile.ZipInfo, ForArchive):
     """
     Bypass name sanitization.
     """
 
     def __init__(self, filename, *args, **kwargs):
         super().__init__(filename, *args, **kwargs)
         self.filename = filename
-
-    @classmethod
-    def for_name(cls, name, archive):
-        """
-        Construct the same way that ZipFile.writestr does.
-
-        TODO: extract this functionality and re-use
-        """
-        self = cls(filename=name, date_time=time.localtime(time.time())[:6])
-        self.compress_type = archive.compression
-        self.compress_level = archive.compresslevel
-        if self.filename.endswith('/'):  # pragma: no cover
-            self.external_attr = 0o40775 << 16  # drwxrwxr-x
-            self.external_attr |= 0x10  # MS-DOS directory flag
-        else:
-            self.external_attr = 0o600 << 16  # ?rw-------
-        return self

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Backported simplified tests from python/cpython#123424.`