Make fullcoverage at least run (doesn't work though).

2 files changed, 8 insertions, 11 deletions

diff --git a/coverage/collector.py b/coverage/collector.py
index 73a14b93..3821de03 100644
--- a/coverage/collector.py
+++ b/coverage/collector.py
@@ -56,7 +56,8 @@ class PyTracer(object):
         """The trace function passed to sys.settrace."""
 
         #print("trace event: %s %r @%d" % (
-        #           event, frame.f_code.co_filename, frame.f_lineno))
+        #           event, frame.f_code.co_filename, frame.f_lineno),
+        #      file=sys.stderr)
 
         if self.last_exc_back:
             if frame == self.last_exc_back:
@@ -243,10 +244,10 @@ class Collector(object):
         if self._collectors:
             self._collectors[-1].pause()
         self._collectors.append(self)
-        #print >>sys.stderr, "Started: %r" % self._collectors
+        #print("Started: %r" % self._collectors, file=sys.stderr)
 
         # Check to see whether we had a fullcoverage tracer installed.
-        traces0 = None
+        traces0 = []
         if hasattr(sys, "gettrace"):
             fn0 = sys.gettrace()
             if fn0:
@@ -257,10 +258,8 @@ class Collector(object):
         # Install the tracer on this thread.
         fn = self._start_tracer()
 
-        if traces0:
-            for args in traces0:
-                (frame, event, arg), lineno = args
-                fn(frame, event, arg, lineno=lineno)
+        for args in traces0:
+            fn(*args)
 
         # Install our installation tracer in threading, to jump start other
         # threads.
diff --git a/coverage/fullcoverage/encodings.py b/coverage/fullcoverage/encodings.py
index 9409b7d7..539d2dd8 100644
--- a/coverage/fullcoverage/encodings.py
+++ b/coverage/fullcoverage/encodings.py
@@ -31,8 +31,7 @@ class FullCoverageTracer(object):
         self.traces = []
 
     def fullcoverage_trace(self, *args):
-        frame, event, arg = args
-        self.traces.append((args, frame.f_lineno))
+        self.traces.append(args)
         return self.fullcoverage_trace
 
 sys.settrace(FullCoverageTracer().fullcoverage_trace)
@@ -43,8 +42,7 @@ sys.settrace(FullCoverageTracer().fullcoverage_trace)
 # happen last, since all of the symbols in this module will become None
 # at that exact moment, including "sys".
 
-parentdirs = [ d for d in sys.path if __file__.startswith(d) ]
-parentdirs.sort(key=len)
+parentdirs = sorted(filter(__file__.startswith, sys.path), key=len)
 sys.path.remove(parentdirs[-1])
 del sys.modules['encodings']
 import encodings