commit 8820c239f778093ad432cf4dce6b607c6d1bf281
author Guido van Rossum <guido@dropbox.com> Thu Nov 21 11:30:06 2013 -0800
committer Guido van Rossum <guido@dropbox.com> Thu Nov 21 11:30:06 2013 -0800
tree 907d2210e79264552f26371c4765e8319c9071b1
parent 9c55a58a1d7f664e7d236ef690d17409841632c4

Better behavior when stepping over yield[from]. Fixes issue 16596. By Xavier de Gaye.

Python/ceval.c

diff --git a/Python/ceval.c b/Python/ceval.c
index e2e882b..ab419dc 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1904,6 +1904,9 @@
             Py_DECREF(v);
             if (retval == NULL) {
                 PyObject *val;
+                if (tstate->c_tracefunc != NULL
+                        && PyErr_ExceptionMatches(PyExc_StopIteration))
+                    call_exc_trace(tstate->c_tracefunc, tstate->c_traceobj, f);
                 err = _PyGen_FetchStopIterationValue(&val);
                 if (err < 0)
                     goto error;
@@ -2654,6 +2657,8 @@
             if (PyErr_Occurred()) {
                 if (!PyErr_ExceptionMatches(PyExc_StopIteration))
                     goto error;
+                else if (tstate->c_tracefunc != NULL)
+                    call_exc_trace(tstate->c_tracefunc, tstate->c_traceobj, f);
                 PyErr_Clear();
             }
             /* iterator ended normally */