From bd206e27a49dd4cc94ee264c706614190ce0eb3c Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sun, 18 Dec 2011 21:04:17 +0100 Subject: Handle correctly _Py_fopen() error: don't replace the exception --- Modules/zipimport.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 @@ read_directory(PyObject *archive_obj) 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 @@ get_data(PyObject *archive, PyObject *toc_entry) 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; } -- cgit v0.12