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, 2 insertions, 0 deletions

diff --git a/coverage/collector.py b/coverage/collector.py
index 0a5349ad..940f7c75 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.