diff options
| author | Victor Stinner <vstinner@python.org> | 2020-04-30 20:44:24 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 20:44:24 (GMT) |
| commit | 3c7f9db85095952821f9d106dd874f75662ce7ec (patch) | |
| tree | 74603d5653001e6fd7f4c02e2ddaed2efbdfb5a4 | |
| parent | 2514a632fb7d37be24c2059d0e286d35600f9795 (diff) | |
| download | cpython-3c7f9db85095952821f9d106dd874f75662ce7ec.zip cpython-3c7f9db85095952821f9d106dd874f75662ce7ec.tar.gz cpython-3c7f9db85095952821f9d106dd874f75662ce7ec.tar.bz2 | |
Revert "bpo-29587: Enable implicit exception chaining with gen.throw() (GH-19811)" (#19821)
This reverts commit 2514a632fb7d37be24c2059d0e286d35600f9795.
| -rw-r--r-- | Lib/test/test_generators.py | 17 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2020-04-30-00-50-25.bpo-29587.oEwSq.rst | 1 | ||||
| -rw-r--r-- | Objects/genobject.c | 6 |
3 files changed, 0 insertions, 24 deletions
diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py index 4d96f44..3e42bc6 100644 --- a/Lib/test/test_generators.py +++ b/Lib/test/test_generators.py @@ -316,23 +316,6 @@ 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(): diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-04-30-00-50-25.bpo-29587.oEwSq.rst b/Misc/NEWS.d/next/Core and Builtins/2020-04-30-00-50-25.bpo-29587.oEwSq.rst deleted file mode 100644 index f44aa36..0000000 --- a/Misc/NEWS.d/next/Core and Builtins/2020-04-30-00-50-25.bpo-29587.oEwSq.rst +++ /dev/null @@ -1 +0,0 @@ -Enable implicit exception chaining when calling :meth:`generator.throw`. diff --git a/Objects/genobject.c b/Objects/genobject.c index 289ed79..6e36690 100644 --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -512,12 +512,6 @@ throw_here: } PyErr_Restore(typ, val, tb); - if (gen->gi_exc_state.exc_type) { - Py_INCREF(gen->gi_exc_state.exc_type); - Py_XINCREF(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: |