diff options
author | R. David Murray <rdmurray@bitdance.com> | 2010-01-06 20:12:07 (GMT) |
---|---|---|
committer | R. David Murray <rdmurray@bitdance.com> | 2010-01-06 20:12:07 (GMT) |
commit | 93a59653a49d60abaeb69a966370b4277e0f1d3a (patch) | |
tree | 5e12375afe1fec6807011469502cc10ef721f169 /Lib/test/test_zipfile.py | |
parent | 875e1e7b7c972f76bf05a7f4caacef47da5c846c (diff) | |
download | cpython-93a59653a49d60abaeb69a966370b4277e0f1d3a.zip cpython-93a59653a49d60abaeb69a966370b4277e0f1d3a.tar.gz cpython-93a59653a49d60abaeb69a966370b4277e0f1d3a.tar.bz2 |
Merged revisions 74246 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r74246 | amaury.forgeotdarc | 2009-07-28 18:18:57 -0400 (Tue, 28 Jul 2009) | 10 lines
Merged revisions 74245 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74245 | amaury.forgeotdarc | 2009-07-29 00:15:30 +0200 (mer., 29 juil. 2009) | 3 lines
#6511: ZipFile will now raise BadZipfile when opening an empty or tiny file,
like it does for larger invalid files.
........
................
Diffstat (limited to 'Lib/test/test_zipfile.py')
-rw-r--r-- | Lib/test/test_zipfile.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py index ed800c5..55cfaa9 100644 --- a/Lib/test/test_zipfile.py +++ b/Lib/test/test_zipfile.py @@ -688,6 +688,16 @@ class OtherTests(unittest.TestCase): # quickly. self.assertRaises(IOError, zipfile.ZipFile, TESTFN) + def test_empty_file_raises_BadZipFile(self): + f = open(TESTFN, 'w') + f.close() + self.assertRaises(zipfile.BadZipfile, zipfile.ZipFile, TESTFN) + + f = open(TESTFN, 'w') + f.write("short file") + f.close() + self.assertRaises(zipfile.BadZipfile, zipfile.ZipFile, TESTFN) + def testClosedZipRaisesRuntimeError(self): # Verify that testzip() doesn't swallow inappropriate exceptions. data = io.BytesIO() |