Chain UnicodeDecodeError as __cause__ and verify in test

Author: tonghuaroot

Lib/test/test_zipimport.py

@@ -1088,7 +1088,9 @@ def testInvalidUTF8FileName(self):
         os_helper.unlink(TESTMOD)
         with open(TESTMOD, 'wb') as fp:
             fp.write(cdh + eocd)
-        self.assertZipFailure(TESTMOD)
+        with self.assertRaises(zipimport.ZipImportError) as cm:
+            zipimport.zipimporter(TESTMOD)
+        self.assertIsInstance(cm.exception.__cause__, UnicodeDecodeError)
 
     # XXX: disabled until this works on Big-endian machines
     def _testBogusZipFile(self):

Lib/zipimport.py

@@ -429,10 +429,10 @@ def _read_directory(archive):
                     # UTF-8 file names extension
                     try:
                         name = name.decode()
-                    except UnicodeDecodeError:
+                    except UnicodeDecodeError as exc:
                         raise ZipImportError(
                             f"can't decode file name in Zip file: {archive!r}",
-                            path=archive)
+                            path=archive) from exc
                 else:
                     # Historical ZIP filename encoding
                     try: