eric: comparison DebugClients/Python3/coverage/html.py

-:456c58fc64b0
+:d0d6e4ad31bd
-"""HTML reporting for Coverage."""
+# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
+# For details: https://bitbucket.org/ned/coveragepy/src/default/NOTICE.txt
-import os, re, shutil, sys
+"""HTML reporting for coverage.py."""
-from . import coverage
-from .backward import pickle
+import datetime
-from .misc import CoverageException, Hasher
+import json
-from .phystokens import source_token_lines, source_encoding
+import os
-from .report import Reporter
+import re
-from .results import Numbers
+import shutil
-from .templite import Templite
+import coverage
+from coverage import env
+from coverage.backward import iitems
+from coverage.files import flat_rootname
+from coverage.misc import CoverageException, Hasher
+from coverage.report import Reporter
+from coverage.results import Numbers
+from coverage.templite import Templite
 # Static files are looked for in a list of places.
 STATIC_PATH = [
 # The place Debian puts system Javascript libraries.
 # Our htmlfiles directory.
 os.path.join(os.path.dirname(__file__), "htmlfiles"),
 ]
 def data_filename(fname, pkgdir=""):
 """Return the path to a data file of ours.
 The file is searched for on `STATIC_PATH`, and the first place it's found,
 is returned.
 Each directory in `STATIC_PATH` is searched as-is, and also, if `pkgdir`
-is provided, at that subdirectory.
+is provided, at that sub-directory.
 """
+tried = []
 for static_dir in STATIC_PATH:
 static_filename = os.path.join(static_dir, fname)
 if os.path.exists(static_filename):
 return static_filename
+else:
+tried.append(static_filename)
 if pkgdir:
 static_filename = os.path.join(static_dir, pkgdir, fname)
 if os.path.exists(static_filename):
 return static_filename
-raise CoverageException("Couldn't find static file %r" % fname)
+else:
+tried.append(static_filename)
+raise CoverageException(
+"Couldn't find static file %r from %r, tried: %r" % (fname, os.getcwd(), tried)
+)
 def data(fname):
 """Return the contents of a data file of ours."""
-data_file = open(data_filename(fname))
+with open(data_filename(fname)) as data_file:
-try:
 return data_file.read()
-finally:
-data_file.close()
 class HtmlReporter(Reporter):
 """HTML reporting."""
-# These files will be copied from the htmlfiles dir to the output dir.
+# These files will be copied from the htmlfiles directory to the output
+# directory.
 STATIC_FILES = [
 ("style.css", ""),
 ("jquery.min.js", "jquery"),
-("jquery.hotkeys.js", "jquery-hotkeys"),
+("jquery.debounce.min.js", "jquery-debounce"),
-("jquery.isonscreen.js", "jquery-isonscreen"),
+("jquery.hotkeys.js", "jquery-hotkeys"),
-("jquery.tablesorter.min.js", "jquery-tablesorter"),
+("jquery.isonscreen.js", "jquery-isonscreen"),
-("coverage_html.js", ""),
+("jquery.tablesorter.min.js", "jquery-tablesorter"),
-("keybd_closed.png", ""),
+("coverage_html.js", ""),
-("keybd_open.png", ""),
+("keybd_closed.png", ""),
-]
+("keybd_open.png", ""),
+]
 def __init__(self, cov, config):
 super(HtmlReporter, self).__init__(cov, config)
 self.directory = None
+title = self.config.html_title
+if env.PY2:
+title = title.decode("utf8")
 self.template_globals = {
 'escape': escape,
-'title': self.config.html_title,
+'pair': pair,
+'title': title,
 '__url__': coverage.__url__,
 '__version__': coverage.__version__,
 }
 self.source_tmpl = Templite(
 data("pyfile.html"), self.template_globals
 )
 self.coverage = cov
 self.files = []
-self.arcs = self.coverage.data.has_arcs()
+self.has_arcs = self.coverage.data.has_arcs()
 self.status = HtmlStatus()
 self.extra_css = None
 self.totals = Numbers()
+self.time_stamp = datetime.datetime.now().strftime('%Y-%m-%d %H:%M')
 def report(self, morfs):
 """Generate an HTML report for `morfs`.
-`morfs` is a list of modules or filenames.
+`morfs` is a list of modules or file names.
 """
 assert self.config.html_dir, "must give a directory for html reporting"
 # Read the status data.
 self.status.read(self.config.html_dir)
 # Check that this run used the same settings as the last run.
 m = Hasher()
 m.update(self.config)
-these_settings = m.digest()
+these_settings = m.hexdigest()
 if self.status.settings_hash() != these_settings:
 self.status.reset()
 self.status.set_settings_hash(these_settings)
 # The user may have extra CSS they want copied.
 # Write the index file.
 self.index_file()
 self.make_local_static_report_files()
+return self.totals.n_statements and self.totals.pc_covered
-return self.totals.pc_covered
 def make_local_static_report_files(self):
 """Make local instances of static files for HTML report."""
 # The files we provide must always be copied.
 for static, pkgdir in self.STATIC_FILES:
 shutil.copyfile(
 data_filename(static, pkgdir),
 os.path.join(self.directory, static)
 )
 # The user may have extra CSS they want copied.
 if self.extra_css:
 shutil.copyfile(
 self.config.extra_css,
 os.path.join(self.directory, self.extra_css)
 )
 def write_html(self, fname, html):
 """Write `html` to `fname`, properly encoded."""
-fout = open(fname, "wb")
+with open(fname, "wb") as fout:
-try:
 fout.write(html.encode('ascii', 'xmlcharrefreplace'))
-finally:
-fout.close()
+def file_hash(self, source, fr):
-def file_hash(self, source, cu):
 """Compute a hash that changes if the file needs to be re-reported."""
 m = Hasher()
 m.update(source)
-self.coverage.data.add_to_hash(cu.filename, m)
+self.coverage.data.add_to_hash(fr.filename, m)
-return m.digest()
+return m.hexdigest()
-def html_file(self, cu, analysis):
+def html_file(self, fr, analysis):
 """Generate an HTML file for one source file."""
-source_file = cu.source_file()
+source = fr.source()
-try:
-source = source_file.read()
-finally:
-source_file.close()
 # Find out if the file on disk is already correct.
-flat_rootname = cu.flat_rootname()
+rootname = flat_rootname(fr.relative_filename())
-this_hash = self.file_hash(source, cu)
+this_hash = self.file_hash(source.encode('utf-8'), fr)
-that_hash = self.status.file_hash(flat_rootname)
+that_hash = self.status.file_hash(rootname)
 if this_hash == that_hash:
 # Nothing has changed to require the file to be reported again.
-self.files.append(self.status.index_info(flat_rootname))
+self.files.append(self.status.index_info(rootname))
 return
-self.status.set_file_hash(flat_rootname, this_hash)
+self.status.set_file_hash(rootname, this_hash)
-# If need be, determine the encoding of the source file. We use it
-# later to properly write the HTML.
-if sys.version_info < (3, 0):
-encoding = source_encoding(source)
-# Some UTF8 files have the dreaded UTF8 BOM. If so, junk it.
-if encoding.startswith("utf-8") and source[:3] == "\xef\xbb\xbf":
-source = source[3:]
-encoding = "utf-8"
 # Get the numbers for this file.
 nums = analysis.numbers
-if self.arcs:
+if self.has_arcs:
 missing_branch_arcs = analysis.missing_branch_arcs()
 # These classes determine which lines are highlighted by default.
 c_run = "run hide_run"
 c_exc = "exc"
 c_mis = "mis"
 c_par = "par " + c_run
 lines = []
-for lineno, line in enumerate(source_token_lines(source)):
+for lineno, line in enumerate(fr.source_token_lines(), start=1):
-lineno += 1     # 1-based line numbers.
 # Figure out how to mark this line.
 line_class = []
 annotate_html = ""
 annotate_title = ""
 if lineno in analysis.statements:
 line_class.append("stm")
 if lineno in analysis.excluded:
 line_class.append(c_exc)
 elif lineno in analysis.missing:
 line_class.append(c_mis)
-elif self.arcs and lineno in missing_branch_arcs:
+elif self.has_arcs and lineno in missing_branch_arcs:
 line_class.append(c_par)
-annlines = []
+shorts = []
+longs = []
 for b in missing_branch_arcs[lineno]:
 if b < 0:
-annlines.append("exit")
+shorts.append("exit")
+longs.append("the function exit")
 else:
-annlines.append(str(b))
+shorts.append(b)
-annotate_html = "&nbsp;&nbsp; ".join(annlines)
+longs.append("line %d" % b)
-if len(annlines) > 1:
+# 202F is NARROW NO-BREAK SPACE.
-annotate_title = "no jumps to these line numbers"
+# 219B is RIGHTWARDS ARROW WITH STROKE.
-elif len(annlines) == 1:
+short_fmt = "%s&#x202F;&#x219B;&#x202F;%s"
-annotate_title = "no jump to this line number"
+annotate_html = ",&nbsp;&nbsp; ".join(short_fmt % (lineno, d) for d in shorts)
+annotate_html += " [?]"
+annotate_title = "Line %d was executed, but never jumped to " % lineno
+if len(longs) == 1:
+annotate_title += longs[0]
+elif len(longs) == 2:
+annotate_title += longs[0] + " or " + longs[1]
+else:
+annotate_title += ", ".join(longs[:-1]) + ", or " + longs[-1]
 elif lineno in analysis.statements:
 line_class.append(c_run)
-# Build the HTML for the line
+# Build the HTML for the line.
 html = []
 for tok_type, tok_text in line:
 if tok_type == "ws":
 html.append(escape(tok_text))
 else:
 tok_html = escape(tok_text) or '&nbsp;'
 html.append(
-"<span class='%s'>%s</span>" % (tok_type, tok_html)
+'<span class="%s">%s</span>' % (tok_type, tok_html)
 )
 lines.append({
 'html': ''.join(html),
 'number': lineno,
 'class': ' '.join(line_class) or "pln",
 'annotate': annotate_html,
 'annotate_title': annotate_title,
 })
 # Write the HTML page for this file.
-html = spaceless(self.source_tmpl.render({
+template_values = {
 'c_exc': c_exc, 'c_mis': c_mis, 'c_par': c_par, 'c_run': c_run,
-'arcs': self.arcs, 'extra_css': self.extra_css,
+'has_arcs': self.has_arcs, 'extra_css': self.extra_css,
-'cu': cu, 'nums': nums, 'lines': lines,
+'fr': fr, 'nums': nums, 'lines': lines,
-}))
+'time_stamp': self.time_stamp,
+}
-if sys.version_info < (3, 0):
+html = spaceless(self.source_tmpl.render(template_values))
-html = html.decode(encoding)
+html_filename = rootname + ".html"
-html_filename = flat_rootname + ".html"
 html_path = os.path.join(self.directory, html_filename)
 self.write_html(html_path, html)
 # Save this file's information for the index file.
 index_info = {
 'nums': nums,
 'html_filename': html_filename,
-'name': cu.name,
+'relative_filename': fr.relative_filename(),
 }
 self.files.append(index_info)
-self.status.set_index_info(flat_rootname, index_info)
+self.status.set_index_info(rootname, index_info)
 def index_file(self):
 """Write the index.html file for this report."""
-index_tmpl = Templite(
+index_tmpl = Templite(data("index.html"), self.template_globals)
-data("index.html"), self.template_globals
-)
+self.totals = sum(f['nums'] for f in self.files)
-self.totals = sum([f['nums'] for f in self.files])
 html = index_tmpl.render({
-'arcs': self.arcs,
+'has_arcs': self.has_arcs,
 'extra_css': self.extra_css,
 'files': self.files,
 'totals': self.totals,
+'time_stamp': self.time_stamp,
 })
-if sys.version_info < (3, 0):
+self.write_html(os.path.join(self.directory, "index.html"), html)
-html = html.decode("utf-8")
-self.write_html(
-os.path.join(self.directory, "index.html"),
-html
-)
 # Write the latest hashes for next time.
 self.status.write(self.directory)
 class HtmlStatus(object):
 """The status information we keep to support incremental reporting."""
-STATUS_FILE = "status.dat"
+STATUS_FILE = "status.json"
 STATUS_FORMAT = 1
+#           pylint: disable=wrong-spelling-in-comment,useless-suppression
+#  The data looks like:
+#
+#  {
+#      'format': 1,
+#      'settings': '540ee119c15d52a68a53fe6f0897346d',
+#      'version': '4.0a1',
+#      'files': {
+#          'cogapp___init__': {
+#              'hash': 'e45581a5b48f879f301c0f30bf77a50c',
+#              'index': {
+#                  'html_filename': 'cogapp___init__.html',
+#                  'name': 'cogapp/__init__',
+#                  'nums': <coverage.results.Numbers object at 0x10ab7ed0>,
+#              }
+#          },
+#          ...
+#          'cogapp_whiteutils': {
+#              'hash': '8504bb427fc488c4176809ded0277d51',
+#              'index': {
+#                  'html_filename': 'cogapp_whiteutils.html',
+#                  'name': 'cogapp/whiteutils',
+#                  'nums': <coverage.results.Numbers object at 0x10ab7d90>,
+#              }
+#          },
+#      },
+#  }
 def __init__(self):
 self.reset()
 def reset(self):
 def read(self, directory):
 """Read the last status in `directory`."""
 usable = False
 try:
 status_file = os.path.join(directory, self.STATUS_FILE)
-fstatus = open(status_file, "rb")
+with open(status_file, "r") as fstatus:
-try:
+status = json.load(fstatus)
-status = pickle.load(fstatus)
-finally:
-fstatus.close()
 except (IOError, ValueError):
 usable = False
 else:
 usable = True
 if status['format'] != self.STATUS_FORMAT:
 usable = False
 elif status['version'] != coverage.__version__:
 usable = False
 if usable:
-self.files = status['files']
+self.files = {}
+for filename, fileinfo in iitems(status['files']):
+fileinfo['index']['nums'] = Numbers(*fileinfo['index']['nums'])
+self.files[filename] = fileinfo
 self.settings = status['settings']
 else:
 self.reset()
 def write(self, directory):
 """Write the current status to `directory`."""
 status_file = os.path.join(directory, self.STATUS_FILE)
+files = {}
+for filename, fileinfo in iitems(self.files):
+fileinfo['index']['nums'] = fileinfo['index']['nums'].init_args()
+files[filename] = fileinfo
 status = {
 'format': self.STATUS_FORMAT,
 'version': coverage.__version__,
 'settings': self.settings,
-'files': self.files,
+'files': files,
 }
-fout = open(status_file, "wb")
+with open(status_file, "w") as fout:
-try:
+json.dump(status, fout)
-pickle.dump(status, fout)
-finally:
+# Older versions of ShiningPanda look for the old name, status.dat.
-fout.close()
+# Accomodate them if we are running under Jenkins.
+# https://issues.jenkins-ci.org/browse/JENKINS-28428
+if "JENKINS_URL" in os.environ:
+with open(os.path.join(directory, "status.dat"), "w") as dat:
+dat.write("https://issues.jenkins-ci.org/browse/JENKINS-28428\n")
 def settings_hash(self):
 """Get the hash of the coverage.py settings."""
 return self.settings
 # Helpers for templates and generating HTML
 def escape(t):
 """HTML-escape the text in `t`."""
-return (t
+return (
-# Convert HTML special chars into HTML entities.
+t
-.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
+# Convert HTML special chars into HTML entities.
-.replace("'", "&#39;").replace('"', "&quot;")
+.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
-# Convert runs of spaces: "......" -> "&nbsp;.&nbsp;.&nbsp;."
+.replace("'", "&#39;").replace('"', "&quot;")
-.replace("  ", "&nbsp; ")
+# Convert runs of spaces: "......" -> "&nbsp;.&nbsp;.&nbsp;."
-# To deal with odd-length runs, convert the final pair of spaces
+.replace("  ", "&nbsp; ")
-# so that "....." -> "&nbsp;.&nbsp;&nbsp;."
+# To deal with odd-length runs, convert the final pair of spaces
-.replace("  ", "&nbsp; ")
+# so that "....." -> "&nbsp;.&nbsp;&nbsp;."
-)
+.replace("  ", "&nbsp; ")
+)
 def spaceless(html):
 """Squeeze out some annoying extra space from an HTML string.
 Nicely-formatted templates mean lots of extra space in the result.
 Get rid of some.
 """
 html = re.sub(r">\s+<p ", ">\n<p ", html)
 return html
+def pair(ratio):
+"""Format a pair of numbers so JavaScript can read them in an attribute."""
+return "%s %s" % ratio

Mercurial Repositories > eric / file comparison

comparison: DebugClients/Python3/coverage/html.py

DebugClients/Python3/coverage/html.py