From e9745dad9717b88548f974f376c2bf6f5a96a494 Mon Sep 17 00:00:00 2001 From: Kirill Podoprigora Date: Wed, 22 Jan 2025 21:33:03 +0200 Subject: [PATCH 1/2] Use EnvironmentVarGuard --- Lib/test/test_zipfile/test_core.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Lib/test/test_zipfile/test_core.py b/Lib/test/test_zipfile/test_core.py index ab5fb650084327..d65475a7f4a14d 100644 --- a/Lib/test/test_zipfile/test_core.py +++ b/Lib/test/test_zipfile/test_core.py @@ -1801,17 +1801,18 @@ def test_write_with_source_date_epoch(self): self.assertAlmostEqual(z_time, g_time, delta=1) def test_write_without_source_date_epoch(self): - if 'SOURCE_DATE_EPOCH' in os.environ: - del os.environ['SOURCE_DATE_EPOCH'] + with os_helper.EnvironmentVarGuard() as env: + if 'SOURCE_DATE_EPOCH' in env: + del env['SOURCE_DATE_EPOCH'] - with zipfile.ZipFile(TESTFN, "w") as zf: - zf.writestr("test_no_source_date_epoch.txt", "Testing without SOURCE_DATE_EPOCH") + with zipfile.ZipFile(TESTFN, "w") as zf: + zf.writestr("test_no_source_date_epoch.txt", "Testing without SOURCE_DATE_EPOCH") - 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=1) + 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=1) def test_close(self): """Check that the zipfile is closed after the 'with' block.""" From 293e2e01ee68ccd71876ecb243aafedb9c39e023 Mon Sep 17 00:00:00 2001 From: Kirill Podoprigora Date: Wed, 22 Jan 2025 22:14:14 +0200 Subject: [PATCH 2/2] Address review --- Lib/test/test_zipfile/test_core.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Lib/test/test_zipfile/test_core.py b/Lib/test/test_zipfile/test_core.py index d65475a7f4a14d..76b1de0e3519f9 100644 --- a/Lib/test/test_zipfile/test_core.py +++ b/Lib/test/test_zipfile/test_core.py @@ -1802,8 +1802,7 @@ def test_write_with_source_date_epoch(self): def test_write_without_source_date_epoch(self): with os_helper.EnvironmentVarGuard() as env: - if 'SOURCE_DATE_EPOCH' in env: - del env['SOURCE_DATE_EPOCH'] + del env['SOURCE_DATE_EPOCH'] with zipfile.ZipFile(TESTFN, "w") as zf: zf.writestr("test_no_source_date_epoch.txt", "Testing without SOURCE_DATE_EPOCH")