Skip to content

Commit

Permalink
bpo-29587: Update gen.throw() to chain exceptions (python#19823)
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
cjerdonek authored May 2, 2020
1 parent f40bd46 commit 0204726
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 0 deletions.
17 changes: 17 additions & 0 deletions Lib/test/test_generators.py
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,23 @@ def g():
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():
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Enable implicit exception chaining when calling :meth:`generator.throw`.
9 changes: 9 additions & 0 deletions Objects/genobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,15 @@ _gen_throw(PyGenObject *gen, int close_on_genexit,
}

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:
Expand Down

0 comments on commit 0204726

Please sign in to comment.