summaryrefslogtreecommitdiff
path: root/coverage
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2009-07-12 09:20:49 -0400
committerNed Batchelder <ned@nedbatchelder.com>2009-07-12 09:20:49 -0400
commit819358c150ea29f471580e4176d714bbcbc0b96d (patch)
treeae0db4e058adf44a9554469304673d26f23a168f /coverage
parentefd4240423fc6cfae9710bd11dcc64d80792b883 (diff)
downloadpython-coveragepy-819358c150ea29f471580e4176d714bbcbc0b96d.tar.gz
Narrow the amount of code in a coverage start/stop window in a test so that the differences in 2.x and 3.x scoping rules don't change the results of the test. Also, some commented-out logging of the trace machinery that helped me find the problem. Now all tests pass on Python 3.1!
Diffstat (limited to 'coverage')
-rw-r--r--coverage/collector.py2
-rw-r--r--coverage/control.py8
2 files changed, 10 insertions, 0 deletions
diff --git a/coverage/collector.py b/coverage/collector.py
index 0a5349a..940f7c7 100644
--- a/coverage/collector.py
+++ b/coverage/collector.py
@@ -20,6 +20,7 @@ except ImportError:
def _global_trace(self, frame, event, arg_unused):
"""The trace function passed to sys.settrace."""
+ #print "global event: %s %r" % (event, frame.f_code.co_filename)
if event == 'call':
# Entering a new function context. Decide if we should trace
# in this file.
@@ -42,6 +43,7 @@ except ImportError:
def _local_trace(self, frame, event, arg_unused):
"""The trace function used within a function."""
+ #print "local event: %s %r" % (event, frame.f_code.co_filename)
if self.last_exc_back:
if frame == self.last_exc_back:
# Someone forgot a return event.
diff --git a/coverage/control.py b/coverage/control.py
index b0e7512..0d19a56 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -119,6 +119,14 @@ class coverage:
return canonical
+ # To log what should_trace returns, change this to "if 1:"
+ if 0:
+ _real_should_trace = _should_trace
+ def _should_trace(self, filename, frame):
+ ret = self._real_should_trace(filename, frame)
+ print "should_trace: %r -> %r" % (filename, ret)
+ return ret
+
def use_cache(self, usecache):
"""Control the use of a data file (incorrectly called a cache).