python
diff --git a/‎Lib/test/test_generators.py‎
Lines changed: 17 additions & 0 deletions b/‎Lib/test/test_generators.py‎
Lines changed: 17 additions & 0 deletions
diff --git a/‎Misc/NEWS.d/next/Core and Builtins/2020-04-30-00-50-25.bpo-29587.oEwSq.rst‎
Lines changed: 1 addition & 0 deletions b/‎Misc/NEWS.d/next/Core and Builtins/2020-04-30-00-50-25.bpo-29587.oEwSq.rst‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Objects/genobject.c‎
Lines changed: 6 additions & 0 deletions b/‎Objects/genobject.c‎
Lines changed: 6 additions & 0 deletions
@@ -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():
 
@@ -0,0 +1 @@
+Enable implicit exception chaining when calling :meth:`generator.throw`.
@@ -512,6 +512,12 @@ _gen_throw(PyGenObject *gen, int close_on_genexit,
     }
 
     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:
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Enable implicit exception chaining when calling :meth:`generator.throw`.