cpython: cd87afe18ff8 (original) (raw)
Mercurial > cpython
changeset 81677:cd87afe18ff8
revert #16672 for incorrect semantics [#16672]
| Benjamin Peterson benjamin@python.org | |
|---|---|
| date | Wed, 23 Jan 2013 08:38:47 -0500 |
| parents | 3d7000549eb1 |
| children | 2c12a1236fdc |
| files | Misc/NEWS Python/ceval.c |
| diffstat | 2 files changed, 3 insertions(+), 6 deletions(-)[+] [-] Misc/NEWS 2 Python/ceval.c 7 |
line wrap: on
line diff
--- a/Misc/NEWS +++ b/Misc/NEWS @@ -50,8 +50,6 @@ Core and Builtins
- Issue #15422: Get rid of PyCFunction_New macro. Use PyCFunction_NewEx function (PyCFunction_New func is still present for backward compatibility). -- Issue #16672: Improve performance tracing performance -
- Issue #14470: Remove w9xpopen support per PEP 11.
- Issue #9856: Replace deprecation warning with raising TypeError
--- a/Python/ceval.c +++ b/Python/ceval.c @@ -1277,8 +1277,7 @@ PyEval_EvalFrameEx(PyFrameObject f, int / line-by-line tracing support */ if (_Py_TracingPossible &&
tstate->c_tracefunc != NULL && !tstate->tracing &&[](#l2.7)f->f_trace != NULL) {[](#l2.8)
tstate->c_tracefunc != NULL && !tstate->tracing) {[](#l2.9) int err;[](#l2.10) /* see maybe_call_line_trace[](#l2.11) for expository comments */[](#l2.12)
@@ -3009,7 +3008,7 @@ error: /* Log traceback info. */ PyTraceBack_Here(f);
if (tstate->c_tracefunc != NULL && f->f_trace != NULL)[](#l2.17)
if (tstate->c_tracefunc != NULL)[](#l2.18) call_exc_trace(tstate->c_tracefunc, tstate->c_traceobj, f);[](#l2.19)
fast_block_end: @@ -3128,7 +3127,7 @@ fast_yield: } if (tstate->use_tracing) {
if (tstate->c_tracefunc && f->f_trace != NULL) {[](#l2.26)
if (tstate->c_tracefunc) {[](#l2.27) if (why == WHY_RETURN || why == WHY_YIELD) {[](#l2.28) if (call_trace(tstate->c_tracefunc,[](#l2.29) tstate->c_traceobj, f,[](#l2.30)