Mercurial > cpython-lru_cache-weakref
diff Python/ceval.c @ 35345:700f08369092 legacy-trunk
Port from the Python 2.4 branch, patches for SF bug # 900092,
hotshot.stats.load.
| author | Barry Warsaw <barry@python.org> |
|---|---|
| date | Mon, 15 Aug 2005 18:14:19 +0000 |
| parents | b2fe5f8fcfdd |
| children | 23dda92de993 |
line wrap: on
line diff
--- a/Python/ceval.c Sun Aug 14 21:42:34 2005 +0000 +++ b/Python/ceval.c Mon Aug 15 18:14:19 2005 +0000 @@ -2480,14 +2480,20 @@ fast_yield: if (tstate->use_tracing) { - if (tstate->c_tracefunc - && (why == WHY_RETURN || why == WHY_YIELD)) { - if (call_trace(tstate->c_tracefunc, - tstate->c_traceobj, f, - PyTrace_RETURN, retval)) { - Py_XDECREF(retval); - retval = NULL; - why = WHY_EXCEPTION; + if (tstate->c_tracefunc) { + if (why == WHY_RETURN || why == WHY_YIELD) { + if (call_trace(tstate->c_tracefunc, + tstate->c_traceobj, f, + PyTrace_RETURN, retval)) { + Py_XDECREF(retval); + retval = NULL; + why = WHY_EXCEPTION; + } + } + else if (why == WHY_EXCEPTION) { + call_trace_protected(tstate->c_tracefunc, + tstate->c_traceobj, f, + PyTrace_RETURN); } } if (tstate->c_profilefunc) {