diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-01-23 13:38:47 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-01-23 13:38:47 (GMT) |
| commit | 51f4616f6eefe4077f15be43b5749b3b24385b59 (patch) | |
| tree | fde2ae710146974018433edd18b63bc0623b1d85 | |
| parent | 42d8773df4a2460080569d44949d644f602bd793 (diff) | |
| download | cpython-51f4616f6eefe4077f15be43b5749b3b24385b59.zip cpython-51f4616f6eefe4077f15be43b5749b3b24385b59.tar.gz cpython-51f4616f6eefe4077f15be43b5749b3b24385b59.tar.bz2 | |
revert #16672 for incorrect semantics
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Python/ceval.c | 7 |
2 files changed, 3 insertions, 6 deletions
@@ -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 diff --git a/Python/ceval.c b/Python/ceval.c index 5f6f35c..32c203e 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1277,8 +1277,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) /* line-by-line tracing support */ if (_Py_TracingPossible && - tstate->c_tracefunc != NULL && !tstate->tracing && - f->f_trace != NULL) { + tstate->c_tracefunc != NULL && !tstate->tracing) { int err; /* see maybe_call_line_trace for expository comments */ @@ -3009,7 +3008,7 @@ error: /* Log traceback info. */ PyTraceBack_Here(f); - if (tstate->c_tracefunc != NULL && f->f_trace != NULL) + if (tstate->c_tracefunc != NULL) call_exc_trace(tstate->c_tracefunc, tstate->c_traceobj, f); fast_block_end: @@ -3128,7 +3127,7 @@ fast_yield: } if (tstate->use_tracing) { - if (tstate->c_tracefunc && f->f_trace != NULL) { + if (tstate->c_tracefunc) { if (why == WHY_RETURN || why == WHY_YIELD) { if (call_trace(tstate->c_tracefunc, tstate->c_traceobj, f, |