Skip to content

Commit 8729213

Browse files
authored
Revert "bpo-29587: Enable implicit exception chaining with gen.throw() (GH-19811)"
This reverts commit 2514a63.
1 parent 2514a63 commit 8729213

File tree

3 files changed

+0
-24
lines changed

3 files changed

+0
-24
lines changed

Lib/test/test_generators.py

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -316,23 +316,6 @@ def g():
316316
self.assertEqual(cm.exception.value.value, 2)
317317

318318

319-
class GeneratorThrowTest(unittest.TestCase):
320-
321-
def test_exception_context_set(self):
322-
def f():
323-
try:
324-
raise KeyError('a')
325-
except Exception:
326-
yield
327-
328-
gen = f()
329-
gen.send(None)
330-
with self.assertRaises(ValueError) as cm:
331-
gen.throw(ValueError)
332-
context = cm.exception.__context__
333-
self.assertEqual((type(context), context.args), (KeyError, ('a',)))
334-
335-
336319
class YieldFromTests(unittest.TestCase):
337320
def test_generator_gi_yieldfrom(self):
338321
def a():

Misc/NEWS.d/next/Core and Builtins/2020-04-30-00-50-25.bpo-29587.oEwSq.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

Objects/genobject.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -512,12 +512,6 @@ _gen_throw(PyGenObject *gen, int close_on_genexit,
512512
}
513513

514514
PyErr_Restore(typ, val, tb);
515-
if (gen->gi_exc_state.exc_type) {
516-
Py_INCREF(gen->gi_exc_state.exc_type);
517-
Py_XINCREF(gen->gi_exc_state.exc_value);
518-
Py_XINCREF(gen->gi_exc_state.exc_traceback);
519-
_PyErr_ChainExceptions(gen->gi_exc_state.exc_type, gen->gi_exc_state.exc_value, gen->gi_exc_state.exc_traceback);
520-
}
521515
return gen_send_ex(gen, Py_None, 1, 0);
522516

523517
failed_throw:

0 commit comments

Comments
 (0)