mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 00:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #28410: Added _PyErr_FormatFromCause() -- the helper for raising

Browse source 
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]
This commit is contained in:
Serhiy Storchaka 2016-10-21 17:09:17 +03:00
parent b0426cd8c4
commit 467ab194fc
7 changed files with 70 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Objects/abstract.c
View file

@ -2198,20 +2198,18 @@ _Py_CheckFunctionResult(PyObject *func, PyObject *result, const char *where)
}
else {
if (err_occurred) {
PyObject *exc, *val, *tb;
PyErr_Fetch(&exc, &val, &tb);
Py_DECREF(result);
if (func)
PyErr_Format(PyExc_SystemError,
"%R returned a result with an error set",
func);
else
PyErr_Format(PyExc_SystemError,
"%s returned a result with an error set",
where);
_PyErr_ChainExceptions(exc, val, tb);
if (func) {
_PyErr_FormatFromCause(PyExc_SystemError,
"%R returned a result with an error set",
func);
}
else {
_PyErr_FormatFromCause(PyExc_SystemError,
"%s returned a result with an error set",
where);
}
#ifdef Py_DEBUG
/* Ensure that the bug is caught in debug mode */
Py_FatalError("a function returned a result with an error set");