diff options
author | Irit Katriel <iritkatriel@yahoo.com> | 2020-12-19 00:09:54 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-19 00:09:54 (GMT) |
commit | fb34096140bbb74c81500dd8bbc3c69c1d24d9ab (patch) | |
tree | 0b3dd85011b4d6f36068f0e69f38666178a10b48 /Lib/test/test_zipimport.py | |
parent | e8d22642105d57007ab1242848a8cbadc7f179df (diff) | |
download | cpython-fb34096140bbb74c81500dd8bbc3c69c1d24d9ab.zip cpython-fb34096140bbb74c81500dd8bbc3c69c1d24d9ab.tar.gz cpython-fb34096140bbb74c81500dd8bbc3c69c1d24d9ab.tar.bz2 |
bpo-24792: Fix zipimporter masking the cause of import errors (GH-22204)
zipimport's _unmarshal_code swallows import errors and then _get_module_code doesn't know the cause of the error, and returns the generic, and sometimes incorrect, 'could not find...'.
Automerge-Triggered-By: GH:brettcannon
Diffstat (limited to 'Lib/test/test_zipimport.py')
-rw-r--r-- | Lib/test/test_zipimport.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py index 6dea2b1..d59ef1e 100644 --- a/Lib/test/test_zipimport.py +++ b/Lib/test/test_zipimport.py @@ -242,10 +242,10 @@ class UncompressedZipImportTestCase(ImportHooksBaseTestCase): files = {TESTMOD + pyc_ext: (NOW, badmagic_pyc)} try: self.doTest(".py", files, TESTMOD) - except ImportError: - pass - else: - self.fail("expected ImportError; import from bad pyc") + self.fail("This should not be reached") + except zipimport.ZipImportError as exc: + self.assertIsInstance(exc.__cause__, ImportError) + self.assertIn("magic number", exc.__cause__.msg) def testBadMTime(self): badtime_pyc = bytearray(test_pyc) |