3.2 - Fix closes Issue6090 - Raise a ValueError, instead of failing with unrelated
exceptions, when a document with timestamp earlier than 1980 is provided to
zipfile. Patch contributed by Petri Lehtinen.
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 @@
+-------+--------------------------+
| Index | Value |
+=======+==========================+
- | ``0`` | Year |
+ | ``0`` | Year (>= 1980) |
+-------+--------------------------+
| ``1`` | Month (one-based) |
+-------+--------------------------+
@@ -411,6 +411,10 @@
| ``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 782020c..bb0d79a 100644
--- a/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@ -507,6 +507,13 @@
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)
+
+
@skipUnless(zlib, "requires zlib")
def test_unicode_filenames(self):
# bug #10801
@@ -1053,6 +1060,10 @@
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 @@
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
diff --git a/Misc/NEWS b/Misc/NEWS
index c9804fc..9b4d833 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -54,6 +54,9 @@
- Issue #12448: smtplib now flushes stdout while running ``python -m smtplib``
in order to display the prompt correctly.
+- Issue #6090: zipfile raises a ValueError when a document with a timestamp
+ earlier than 1980 is provided. Patch contributed by Petri Lehtinen.
+
- Issue #13194: zlib.compressobj().copy() and zlib.decompressobj().copy() are
now available on Windows.