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:
Chris Jerdonek 2020-05-01 18:14:19 -07:00 committed by GitHub
parent f40bd466bf
commit 02047265eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 0 deletions

View File

@ -316,6 +316,23 @@ class ExceptionTest(unittest.TestCase):
self.assertEqual(cm.exception.value.value, 2)
class GeneratorThrowTest(unittest.TestCase):
def test_exception_context_set(self):
def f():
try:
raise KeyError('a')
except Exception:
yield
gen = f()
gen.send(None)
with self.assertRaises(ValueError) as cm:
gen.throw(ValueError)
context = cm.exception.__context__
self.assertEqual((type(context), context.args), (KeyError, ('a',)))
class YieldFromTests(unittest.TestCase):
def test_generator_gi_yieldfrom(self):
def a():

View File

@ -0,0 +1 @@
Enable implicit exception chaining when calling :meth:`generator.throw`.

View File

@ -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: