summaryrefslogtreecommitdiff
path: root/coverage/collector.py
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2015-08-23 15:09:35 -0400
committerNed Batchelder <ned@nedbatchelder.com>2015-08-23 15:09:35 -0400
commit6906cf6e891d3dd9eee4db838315da5cb1c28df5 (patch)
tree75fdb7445c7064170a1b0d04238b68130ceffe1a /coverage/collector.py
parent976c7bf435b11de8f392a967ce20fcafa104319e (diff)
downloadpython-coveragepy-6906cf6e891d3dd9eee4db838315da5cb1c28df5.tar.gz
Oops, that last commit broke fullcoverage. Fix it.
Diffstat (limited to 'coverage/collector.py')
-rw-r--r--coverage/collector.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/coverage/collector.py b/coverage/collector.py
index 494ad2c..a09556b 100644
--- a/coverage/collector.py
+++ b/coverage/collector.py
@@ -232,6 +232,15 @@ class Collector(object):
if self._collectors:
self._collectors[-1].pause()
+ # Check to see whether we had a fullcoverage tracer installed. If so,
+ # get the stack frames it stashed away for us.
+ traces0 = []
+ fn0 = sys.gettrace()
+ if fn0:
+ tracer0 = getattr(fn0, '__self__', None)
+ if tracer0:
+ traces0 = getattr(tracer0, 'traces', [])
+
try:
# Install the tracer on this thread.
fn = self._start_tracer()
@@ -244,14 +253,6 @@ class Collector(object):
# stack of collectors.
self._collectors.append(self)
- # Check to see whether we had a fullcoverage tracer installed.
- traces0 = []
- fn0 = sys.gettrace()
- if fn0:
- tracer0 = getattr(fn0, '__self__', None)
- if tracer0:
- traces0 = getattr(tracer0, 'traces', [])
-
# Replay all the events from fullcoverage into the new trace function.
for args in traces0:
(frame, event, arg), lineno = args