Commit bd206e27 authored by Victor Stinner's avatar Victor Stinner

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

parent 165b1283
...@@ -736,7 +736,8 @@ read_directory(PyObject *archive_obj) ...@@ -736,7 +736,8 @@ read_directory(PyObject *archive_obj)
fp = _Py_fopen(archive_obj, "rb"); fp = _Py_fopen(archive_obj, "rb");
if (fp == NULL) { 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; return NULL;
} }
fseek(fp, -22, SEEK_END); fseek(fp, -22, SEEK_END);
...@@ -909,8 +910,9 @@ get_data(PyObject *archive, PyObject *toc_entry) ...@@ -909,8 +910,9 @@ get_data(PyObject *archive, PyObject *toc_entry)
fp = _Py_fopen(archive, "rb"); fp = _Py_fopen(archive, "rb");
if (!fp) { if (!fp) {
PyErr_Format(PyExc_IOError, if (!PyErr_Occurred())
"zipimport: can not open file %U", archive); PyErr_Format(PyExc_IOError,
"zipimport: can not open file %U", archive);
return NULL; return NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment