summaryrefslogtreecommitdiff
path: root/coverage/html.py
diff options
context:
space:
mode:
Diffstat (limited to 'coverage/html.py')
-rw-r--r--coverage/html.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/coverage/html.py b/coverage/html.py
index b0c61649..bb519254 100644
--- a/coverage/html.py
+++ b/coverage/html.py
@@ -1,16 +1,18 @@
# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
-# For details: https://bitbucket.org/ned/coveragepy/src/default/NOTICE.txt
+# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
"""HTML reporting for coverage.py."""
import datetime
import json
import os
+import re
import shutil
import coverage
from coverage import env
from coverage.backward import iitems
+from coverage.data import add_data_to_hash
from coverage.files import flat_rootname
from coverage.misc import CoverageException, file_be_gone, Hasher, isolate_module
from coverage.report import Reporter
@@ -66,6 +68,7 @@ def read_data(fname):
def write_html(fname, html):
"""Write `html` to `fname`, properly encoded."""
+ html = re.sub(r"(\A\s+)|(\s+$)", "", html, flags=re.MULTILINE) + "\n"
with open(fname, "wb") as fout:
fout.write(html.encode('ascii', 'xmlcharrefreplace'))
@@ -102,11 +105,11 @@ class HtmlReporter(Reporter):
}
self.source_tmpl = Templite(read_data("pyfile.html"), self.template_globals)
- self.coverage = cov
+ self.data = cov.get_data()
self.files = []
self.all_files_nums = []
- self.has_arcs = self.coverage.data.has_arcs()
+ self.has_arcs = self.data.has_arcs()
self.status = HtmlStatus()
self.extra_css = None
self.totals = Numbers()
@@ -167,7 +170,7 @@ class HtmlReporter(Reporter):
"""Compute a hash that changes if the file needs to be re-reported."""
m = Hasher()
m.update(source)
- self.coverage.data.add_to_hash(fr.filename, m)
+ add_data_to_hash(self.data, fr.filename, m)
return m.hexdigest()
def html_file(self, fr, analysis):