commit 357347627186a037805b12ff1740d36d0f8e2e11
author Victor Stinner <victor.stinner@haypocalc.com> Sun Dec 18 21:05:22 2011 +0100
committer Victor Stinner <victor.stinner@haypocalc.com> Sun Dec 18 21:05:22 2011 +0100
tree 528222a77785f9b82fadcc5ae98cd0d44846fc15
parent bd0850b8575730fb1ea587a64e95c818e9504c13
parent bd206e27a49dd4cc94ee264c706614190ce0eb3c

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

Modules/zipimport.c

diff --git a/Modules/zipimport.c b/Modules/zipimport.c
index ed835c9..09bd83a 100644
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -742,7 +742,8 @@
 
     fp = _Py_fopen(archive, "rb");
     if (fp == NULL) {
-        PyErr_Format(ZipImportError, "can't open Zip file: %R", archive);
+        if (!PyErr_Occurred())
+            PyErr_Format(ZipImportError, "can't open Zip file: %R", archive);
         return NULL;
     }
     fseek(fp, -22, SEEK_END);
@@ -913,8 +914,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;
     }