summaryrefslogtreecommitdiff
path: root/Lib/trace.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-12-12 12:58:45 +0100
committerVictor Stinner <victor.stinner@gmail.com>2014-12-12 12:58:45 +0100
commit808eb752b8381e17e192e69f96791f5401efe895 (patch)
treeee101ff07894e0cbc1d302b4963009cb48a7b999 /Lib/trace.py
parenta907ce64d4523285f131f4c22a62d6b88805009f (diff)
parent1b0701bb08dc23bd32212dd896a1c3589f9f6268 (diff)
downloadcpython-808eb752b8381e17e192e69f96791f5401efe895.tar.gz
Merge 3.4 (test_selectors)
Diffstat (limited to 'Lib/trace.py')
-rwxr-xr-xLib/trace.py24
1 files changed, 11 insertions, 13 deletions
diff --git a/Lib/trace.py b/Lib/trace.py
index 09fe9ee0e4..fe849734be 100755
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -59,10 +59,7 @@ import gc
import dis
import pickle
from warnings import warn as _warn
-try:
- from time import monotonic as _time
-except ImportError:
- from time import time as _time
+from time import monotonic as _time
try:
import threading
@@ -326,16 +323,17 @@ class CoverageResults:
lnotab = _find_executable_linenos(filename)
else:
lnotab = {}
+ if lnotab:
+ source = linecache.getlines(filename)
+ coverpath = os.path.join(dir, modulename + ".cover")
+ with open(filename, 'rb') as fp:
+ encoding, _ = tokenize.detect_encoding(fp.readline)
+ n_hits, n_lines = self.write_results_file(coverpath, source,
+ lnotab, count, encoding)
+ if summary and n_lines:
+ percent = int(100 * n_hits / n_lines)
+ sums[modulename] = n_lines, percent, modulename, filename
- source = linecache.getlines(filename)
- coverpath = os.path.join(dir, modulename + ".cover")
- with open(filename, 'rb') as fp:
- encoding, _ = tokenize.detect_encoding(fp.readline)
- n_hits, n_lines = self.write_results_file(coverpath, source,
- lnotab, count, encoding)
- if summary and n_lines:
- percent = int(100 * n_hits / n_lines)
- sums[modulename] = n_lines, percent, modulename, filename
if summary and sums:
print("lines cov% module (path)")