Mercurial > cpython-lru_cache-weakref

diff Python/ceval.c @ 81677:cd87afe18ff8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert #16672 for incorrect semantics
author Benjamin Peterson <benjamin@python.org>
date Wed, 23 Jan 2013 08:38:47 -0500
parents 1fb26db7d719
children d296cf1600a8
line wrap: on
line diff
--- a/Python/ceval.c	Wed Jan 23 03:01:23 2013 -0800
+++ b/Python/ceval.c	Wed Jan 23 08:38:47 2013 -0500
@@ -1277,8 +1277,7 @@
         /* 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 @@
         /* 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 @@
     }
 
     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,