commit 51f4616f6eefe4077f15be43b5749b3b24385b59
author Benjamin Peterson <benjamin@python.org> Wed Jan 23 08:38:47 2013 -0500
committer Benjamin Peterson <benjamin@python.org> Wed Jan 23 08:38:47 2013 -0500
tree fde2ae710146974018433edd18b63bc0623b1d85
parent 42d8773df4a2460080569d44949d644f602bd793

revert #16672 for incorrect semantics

Python/ceval.c

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 @@
         /* 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,