Merge branch 'main' into fix-150075-tar-addfile-no-offsets

Author: grantlouisherman

Lib/test/test_zipfile/test_core.py

@@ -1886,11 +1886,8 @@ def test_write_with_source_date_epoch(self):
 
             with zipfile.ZipFile(TESTFN, "r") as zf:
                 zip_info = zf.getinfo("test_source_date_epoch.txt")
-                get_time = time.localtime(int(os.environ['SOURCE_DATE_EPOCH']))[:6]
-                # Compare each element of the date_time tuple
-                # Allow for a 1-second difference
-                for z_time, g_time in zip(zip_info.date_time, get_time):
-                    self.assertAlmostEqual(z_time, g_time, delta=1)
+                expected_utc = (2025, 1, 1, 7, 19, 58)
+                self.assertEqual(zip_info.date_time, expected_utc)
 
     def test_write_without_source_date_epoch(self):
         with os_helper.EnvironmentVarGuard() as env:
@@ -1901,9 +1898,13 @@ def test_write_without_source_date_epoch(self):
 
             with zipfile.ZipFile(TESTFN, "r") as zf:
                 zip_info = zf.getinfo("test_no_source_date_epoch.txt")
-                current_time = time.localtime()[:6]
-                for z_time, c_time in zip(zip_info.date_time, current_time):
-                    self.assertAlmostEqual(z_time, c_time, delta=2)
+                self.assertTimestampAlmostEqual(time.localtime(), zip_info.date_time, tolerance=2)
+
+    def assertTimestampAlmostEqual(self, time1, time2, tolerance):
+        import datetime
+        dt1 = datetime.datetime(*time1[:6])
+        dt2 = datetime.datetime(*time2[:6])
+        self.assertLessEqual((dt1 - dt2).total_seconds(), tolerance)
 
     def test_close(self):
         """Check that the zipfile is closed after the 'with' block."""

Lib/zipfile/__init__.py

@@ -663,9 +663,12 @@ def _for_archive(self, archive):
         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]
+        source_date_epoch = os.environ.get('SOURCE_DATE_EPOCH')
+
+        if source_date_epoch:
+            self.date_time = time.gmtime(int(source_date_epoch))[:6]
+        else:
+            self.date_time = time.localtime(time.time())[:6]
 
         self.compress_type = archive.compression
         self.compress_level = archive.compresslevel

Misc/NEWS.d/next/Library/2025-05-19-21-08-25.gh-issue-134261.ravGYm.rst

@@ -0,0 +1 @@
+zip: On reproducible builds, ZipFile uses UTC instead of the local time when writing file datetimes to avoid underflows.

Objects/lazyimportobject.c

@@ -135,7 +135,7 @@ PyDoc_STRVAR(lazy_import_doc,
 "lazy_import(builtins, name, fromlist=None, /)\n"
 "--\n"
 "\n"
-"Represents a deferred import that will be resolved on first use.\n"
+"Represents a lazy import that will be resolved on first use.\n"
 "\n"
 "Instances of this object accessed from the global scope will be\n"
 "automatically imported based upon their name and then replaced with\n"

Python/import.c

@@ -4049,7 +4049,7 @@ _PyImport_LoadLazyImportTstate(PyThreadState *tstate, PyObject *lazy_import)
 
         // Create a cause exception showing where the lazy import was declared.
         PyObject *msg = PyUnicode_FromFormat(
-            "deferred import of '%U' raised an exception during resolution",
+            "lazy import of '%U' raised an exception during resolution",
             import_name
         );
         Py_DECREF(import_name); // Done with import_name.