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!

1 files changed, 8 insertions, 0 deletions

diff --git a/coverage/control.py b/coverage/control.py
index b0e7512e..0d19a56c 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).