diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2013-01-29 18:15:45 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2013-01-29 18:15:45 (GMT) |
commit | f7209225bbc386aa3dd49e5c2c601cd0906ccb53 (patch) | |
tree | 2b047a9f9658fc8eb22d45c57b1224e47e7141b6 /Lib/test/test_zipfile.py | |
parent | e5581f9d68b1b7156a2a44d47675604c648d08ff (diff) | |
parent | c5b75db5def1890924d914bc36b54e6a120bf2d7 (diff) | |
download | cpython-f7209225bbc386aa3dd49e5c2c601cd0906ccb53.zip cpython-f7209225bbc386aa3dd49e5c2c601cd0906ccb53.tar.gz cpython-f7209225bbc386aa3dd49e5c2c601cd0906ccb53.tar.bz2 |
Issue #12004: Fix an internal error in PyZipFile when writing an invalid
Python file. Patch by Ben Morgan.
Diffstat (limited to 'Lib/test/test_zipfile.py')
-rw-r--r-- | Lib/test/test_zipfile.py | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py index 369cb4f..88b2aa2 100644 --- a/Lib/test/test_zipfile.py +++ b/Lib/test/test_zipfile.py @@ -13,7 +13,9 @@ from tempfile import TemporaryFile from random import randint, random from unittest import skipUnless -from test.support import TESTFN, run_unittest, findfile, unlink, requires_zlib, requires_bz2, requires_lzma +from test.support import (TESTFN, run_unittest, findfile, unlink, + requires_zlib, requires_bz2, requires_lzma, + captured_stdout) TESTFN2 = TESTFN + "2" TESTFNDIR = TESTFN + "d" @@ -854,6 +856,28 @@ class PyZipFileTests(unittest.TestCase): self.assertRaises(RuntimeError, zipfp.writepy, TESTFN) os.remove(TESTFN) + def test_write_pyfile_bad_syntax(self): + os.mkdir(TESTFN2) + try: + with open(os.path.join(TESTFN2, "mod1.py"), "w") as fp: + fp.write("Bad syntax in python file\n") + + with TemporaryFile() as t, zipfile.PyZipFile(t, "w") as zipfp: + # syntax errors are printed to stdout + with captured_stdout() as s: + zipfp.writepy(os.path.join(TESTFN2, "mod1.py")) + + self.assertIn("SyntaxError", s.getvalue()) + + # as it will not have compiled the python file, it will + # include the .py file not .pyc or .pyo + names = zipfp.namelist() + self.assertIn('mod1.py', names) + self.assertNotIn('mod1.pyc', names) + self.assertNotIn('mod1.pyo', names) + + finally: + shutil.rmtree(TESTFN2) class OtherTests(unittest.TestCase): zips_with_bad_crc = { |