mirror of
https://github.com/python/cpython.git
synced 2025-12-15 21:44:50 +00:00
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.
This commit is contained in:
parent
1ef0c0349e
commit
29fa9d4d68
4 changed files with 23 additions and 1 deletions
|
|
@ -507,6 +507,13 @@ 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)
|
||||
|
||||
|
||||
@skipUnless(zlib, "requires zlib")
|
||||
def test_unicode_filenames(self):
|
||||
# bug #10801
|
||||
|
|
@ -1053,6 +1060,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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue