Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

revert #16672 for incorrect semantics

Browse source
This commit is contained in:
Benjamin Peterson 2013-01-23 08:38:47 -05:00
parent 42d8773df4
commit 51f4616f6e
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -50,8 +50,6 @@ Core and Builtins
- Issue #15422: Get rid of PyCFunction_New macro. Use PyCFunction_NewEx - Issue #15422: Get rid of PyCFunction_New macro. Use PyCFunction_NewEx
function (PyCFunction_New func is still present for backward compatibility). 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 #14470: Remove w9xpopen support per PEP 11.
- Issue #9856: Replace deprecation warning with raising TypeError - Issue #9856: Replace deprecation warning with raising TypeError

7
Python/ceval.c
View file

@ -1277,8 +1277,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
/* line-by-line tracing support */ /* line-by-line tracing support */
if (_Py_TracingPossible && if (_Py_TracingPossible &&
tstate->c_tracefunc != NULL && !tstate->tracing && tstate->c_tracefunc != NULL && !tstate->tracing) {
f->f_trace != NULL) {
int err; int err;
/* see maybe_call_line_trace /* see maybe_call_line_trace
for expository comments */ for expository comments */
@ -3009,7 +3008,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
/* Log traceback info. */ /* Log traceback info. */
PyTraceBack_Here(f); 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); call_exc_trace(tstate->c_tracefunc, tstate->c_traceobj, f);
fast_block_end: fast_block_end:
@ -3128,7 +3127,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
} }
if (tstate->use_tracing) { if (tstate->use_tracing) {
if (tstate->c_tracefunc && f->f_trace != NULL) { if (tstate->c_tracefunc) {
if (why == WHY_RETURN || why == WHY_YIELD) { if (why == WHY_RETURN || why == WHY_YIELD) {
if (call_trace(tstate->c_tracefunc, if (call_trace(tstate->c_tracefunc,
tstate->c_traceobj, f, tstate->c_traceobj, f,