diff options
| -rw-r--r-- | Doc/library/zipfile.rst | 6 | ||||
| -rw-r--r-- | Lib/test/test_zipfile.py | 16 | ||||
| -rw-r--r-- | Lib/zipfile.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
4 files changed, 28 insertions, 1 deletions
diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst index 019a894..6f84bcc 100644 --- a/Doc/library/zipfile.rst +++ b/Doc/library/zipfile.rst @@ -398,7 +398,7 @@ Instances have the following attributes: +-------+--------------------------+ | Index | Value | +=======+==========================+ - | ``0`` | Year | + | ``0`` | Year (>= 1980) | +-------+--------------------------+ | ``1`` | Month (one-based) | +-------+--------------------------+ @@ -411,6 +411,10 @@ Instances have the following attributes: | ``5`` | Seconds (zero-based) | +-------+--------------------------+ + .. note:: + + The ZIP file format does not support timestamps before 1980. + .. attribute:: ZipInfo.compress_type diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py index 4dcb690..0b3a694 100644 --- a/Lib/test/test_zipfile.py +++ b/Lib/test/test_zipfile.py @@ -500,6 +500,18 @@ class TestsWithSourceFile(unittest.TestCase): except zipfile.BadZipFile: self.assertTrue(zipfp2.fp is None, 'zipfp is not closed') + def test_add_file_before_1980(self): + # Set atime and mtime to 1970-01-01 + os.utime(TESTFN, (0, 0)) + with zipfile.ZipFile(TESTFN2, "w") as zipfp: + self.assertRaises(ValueError, zipfp.write, TESTFN) + + + + + + + @requires_zlib def test_unicode_filenames(self): # bug #10801 @@ -1046,6 +1058,10 @@ class OtherTests(unittest.TestCase): f.close() self.assertRaises(zipfile.BadZipFile, zipfile.ZipFile, TESTFN, 'r') + def test_create_zipinfo_before_1980(self): + self.assertRaises(ValueError, + zipfile.ZipInfo, 'seventies', (1979, 1, 1, 0, 0, 0)) + def tearDown(self): unlink(TESTFN) unlink(TESTFN2) diff --git a/Lib/zipfile.py b/Lib/zipfile.py index 5cc7816..6ca269f 100644 --- a/Lib/zipfile.py +++ b/Lib/zipfile.py @@ -300,6 +300,10 @@ class ZipInfo (object): self.filename = filename # Normalized file name self.date_time = date_time # year, month, day, hour, min, sec + + if date_time[0] < 1980: + raise ValueError('ZIP does not support timestamps before 1980') + # Standard values: self.compress_type = ZIP_STORED # Type of compression for the file self.comment = b"" # Comment for each file @@ -319,6 +319,9 @@ Core and Builtins Library ------- +- Issue #6090: zipfile raises a ValueError when a document with a timestamp + earlier than 1980 is provided. Patch contributed by Petri Lehtinen. + - Issue #13150: sysconfig no longer parses the Makefile and config.h files when imported, instead doing it at build time. This makes importing sysconfig faster and reduces Python startup time by 20%. |