diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2016-10-21 14:09:17 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-10-21 14:09:17 (GMT) |
| commit | 467ab194fc6189d9f7310c89937c51abeac56839 (patch) | |
| tree | ac2397959d646b3656fbf4759f4e6cb9d82e4ae6 /Modules/zipimport.c | |
| parent | b0426cd8c4ecaa19cff05b4860da1c06531a77c1 (diff) | |
| download | cpython-467ab194fc6189d9f7310c89937c51abeac56839.zip cpython-467ab194fc6189d9f7310c89937c51abeac56839.tar.gz cpython-467ab194fc6189d9f7310c89937c51abeac56839.tar.bz2 | |
Issue #28410: Added _PyErr_FormatFromCause() -- the helper for raising
new exception with setting current exception as __cause__.
_PyErr_FormatFromCause(exception, format, args...) is equivalent to Python
raise exception(format % args) from sys.exc_info()[1]
Diffstat (limited to 'Modules/zipimport.c')
| -rw-r--r-- | Modules/zipimport.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Modules/zipimport.c b/Modules/zipimport.c index 7473a8f..59046aa 100644 --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -907,10 +907,8 @@ read_directory(PyObject *archive) fp = _Py_fopen_obj(archive, "rb"); if (fp == NULL) { if (PyErr_ExceptionMatches(PyExc_OSError)) { - PyObject *exc, *val, *tb; - PyErr_Fetch(&exc, &val, &tb); - PyErr_Format(ZipImportError, "can't open Zip file: %R", archive); - _PyErr_ChainExceptions(exc, val, tb); + _PyErr_FormatFromCause(ZipImportError, + "can't open Zip file: %R", archive); } return NULL; } |