FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[3.15] gh-134261: ZipFile - Don't rely on local time for reproducible builds & tests (GH-134264) by miss-islington · Pull Request #150137 · python/cpython · GitHub

Repository navigation

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .py  (2) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
17 changes: 9 additions & 8 deletions Lib/test/test_zipfile/test_core.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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."""
Expand Down
9 changes: 6 additions & 3 deletions Lib/zipfile/__init__.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
zip: On reproducible builds, ZipFile uses UTC instead of the local time when writing file datetimes to avoid underflows.
Loading

Back | FazBrowse Home | New Git URL