commit bd206e27a49dd4cc94ee264c706614190ce0eb3c
author Victor Stinner <victor.stinner@haypocalc.com> Sun Dec 18 21:04:17 2011 +0100
committer Victor Stinner <victor.stinner@haypocalc.com> Sun Dec 18 21:04:17 2011 +0100
tree ab131b292e8e580077bbfe3bd4661062cc95cb0d
parent 165b1283ffe5922dd9f64ef7edb5534e6983d2f5

Handle correctly _Py_fopen() error: don't replace the exception

Modules/zipimport.c

diff --git a/Modules/zipimport.c b/Modules/zipimport.c
index 68c2894..11c3904 100644
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -736,7 +736,8 @@
 
     fp = _Py_fopen(archive_obj, "rb");
     if (fp == NULL) {
-        PyErr_Format(ZipImportError, "can't open Zip file: '%U'", archive_obj);
+        if (!PyErr_Occurred())
+            PyErr_Format(ZipImportError, "can't open Zip file: '%U'", archive_obj);
         return NULL;
     }
     fseek(fp, -22, SEEK_END);
@@ -909,8 +910,9 @@
 
     fp = _Py_fopen(archive, "rb");
     if (!fp) {
-        PyErr_Format(PyExc_IOError,
-           "zipimport: can not open file %U", archive);
+        if (!PyErr_Occurred())
+            PyErr_Format(PyExc_IOError,
+               "zipimport: can not open file %U", archive);
         return NULL;
     }