mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
bpo-29587: Update gen.throw() to chain exceptions (#19823)
Before this commit, if an exception was active inside a generator when calling gen.throw(), that exception was lost (i.e. there was no implicit exception chaining). This commit fixes that by setting exc.__context__ when calling gen.throw(exc).
This commit is contained in:
parent
f40bd466bf
commit
02047265eb
3 changed files with 27 additions and 0 deletions
|
@ -512,6 +512,15 @@ throw_here:
|
|||
}
|
||||
|
||||
PyErr_Restore(typ, val, tb);
|
||||
/* XXX Should we also handle the case where exc_type is true and
|
||||
exc_value is false? */
|
||||
if (gen->gi_exc_state.exc_type && gen->gi_exc_state.exc_value) {
|
||||
Py_INCREF(gen->gi_exc_state.exc_type);
|
||||
Py_INCREF(gen->gi_exc_state.exc_value);
|
||||
Py_XINCREF(gen->gi_exc_state.exc_traceback);
|
||||
_PyErr_ChainExceptions(gen->gi_exc_state.exc_type,
|
||||
gen->gi_exc_state.exc_value, gen->gi_exc_state.exc_traceback);
|
||||
}
|
||||
return gen_send_ex(gen, Py_None, 1, 0);
|
||||
|
||||
failed_throw:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue