Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-06-09 11:22:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

gh-134261: ZipFile - Don't rely on local time for reproducible builds & tests (#134264)

Browse source 
---------

Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
Co-authored-by: Emma Smith <emma@emmatyping.dev>
Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
This commit is contained in:
Caleb 2026-05-19 21:36:19 -04:00 • committed by GitHub
parent de9c32fc34
commit 9dcf94e906
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Lib/test/test_zipfile/test_core.py
View file

@ -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."""

9
Lib/zipfile/__init__.py
View file

@ -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

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

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