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.
This commit is contained in:
parent
59a06d412d
commit
ddd40312d5
|
@ -388,7 +388,7 @@ Instances have the following attributes:
|
|||
+-------+--------------------------+
|
||||
| Index | Value |
|
||||
+=======+==========================+
|
||||
| ``0`` | Year |
|
||||
| ``0`` | Year (>= 1980) |
|
||||
+-------+--------------------------+
|
||||
| ``1`` | Month (one-based) |
|
||||
+-------+--------------------------+
|
||||
|
@ -401,6 +401,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
|
||||
|
||||
|
|
|
@ -477,6 +477,12 @@ 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)
|
||||
|
||||
def tearDown(self):
|
||||
unlink(TESTFN)
|
||||
unlink(TESTFN2)
|
||||
|
@ -990,6 +996,10 @@ class OtherTests(unittest.TestCase):
|
|||
pass
|
||||
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)
|
||||
|
|
|
@ -290,6 +290,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 = "" # Comment for each file
|
||||
|
|
|
@ -63,6 +63,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 #13194: zlib.compressobj().copy() and zlib.decompressobj().copy() are
|
||||
now available on Windows.
|
||||
|
||||
|
|
Loading…
Reference in New Issue