diff options
Diffstat (limited to 'coverage')
| -rw-r--r-- | coverage/collector.py | 2 | ||||
| -rw-r--r-- | coverage/fullcoverage/encodings.py | 6 | ||||
| -rw-r--r-- | coverage/tracer.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/coverage/collector.py b/coverage/collector.py index 5498cc6c..8b8b1ffc 100644 --- a/coverage/collector.py +++ b/coverage/collector.py @@ -233,7 +233,7 @@ class Collector(object): self._collectors[-1].pause() self._collectors.append(self) #print >>sys.stderr, "Started: %r" % self._collectors - + # Check to see whether we had a fullcoverage tracer installed. traces0 = None if hasattr(sys, "gettrace"): diff --git a/coverage/fullcoverage/encodings.py b/coverage/fullcoverage/encodings.py index 4e1ab354..9409b7d7 100644 --- a/coverage/fullcoverage/encodings.py +++ b/coverage/fullcoverage/encodings.py @@ -43,8 +43,8 @@ sys.settrace(FullCoverageTracer().fullcoverage_trace) # happen last, since all of the symbols in this module will become None # at that exact moment, including "sys". -import os -this = os.path.dirname(__file__) -sys.path.remove(this) +parentdirs = [ d for d in sys.path if __file__.startswith(d) ] +parentdirs.sort(key=len) +sys.path.remove(parentdirs[-1]) del sys.modules['encodings'] import encodings diff --git a/coverage/tracer.c b/coverage/tracer.c index e9fc56b4..2e7c7a55 100644 --- a/coverage/tracer.c +++ b/coverage/tracer.c @@ -473,7 +473,7 @@ Tracer_trace(Tracer *self, PyFrameObject *frame, int what, PyObject *arg_unused) * optional keyword argument: * * def Tracer_call(frame, event, arg, lineno=0) - * + * * If provided, the lineno argument is used as the line number, and the * frame's f_lineno member is ignored. */ @@ -500,7 +500,7 @@ Tracer_call(Tracer *self, PyObject *args, PyObject *kwds) static char *kwlist[] = {"frame", "event", "arg", "lineno", NULL}; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!O!O|i:Tracer_call", kwlist, + if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!O!O|i:Tracer_call", kwlist, &PyFrame_Type, &frame, &MyText_Type, &what_str, &arg, &lineno)) { goto done; } |