eric: comparison eric6/DebugClients/Python/coverage/xmlreport.py

-:9bb7d8b0f966
+:27c55a3d0b89
 # coding: utf-8
 # 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
 """XML reporting for coverage.py"""
 import os
 import os.path
-import re
 import sys
 import time
 import xml.dom.minidom
 from coverage import env
 from coverage import __url__, __version__, files
 from coverage.backward import iitems
 from coverage.misc import isolate_module
-from coverage.report import Reporter
+from coverage.report import get_analysis_to_report
 os = isolate_module(os)
 DTD_URL = 'https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd'
 return "1"
 else:
 return "%.4g" % (float(hit) / num)
-class XmlReporter(Reporter):
+class XmlReporter(object):
 """A reporter for writing Cobertura-style XML coverage results."""
-def __init__(self, coverage, config):
+def __init__(self, coverage):
-super(XmlReporter, self).__init__(coverage, config)
+self.coverage = coverage
+self.config = self.coverage.config
 self.source_paths = set()
-if config.source:
+if self.config.source:
-for src in config.source:
+for src in self.config.source:
 if os.path.exists(src):
 self.source_paths.add(files.canonical_filename(src))
 self.packages = {}
 self.xml_out = None
-self.has_arcs = coverage.data.has_arcs()
 def report(self, morfs, outfile=None):
 """Generate a Cobertura-compatible XML report for `morfs`.
 `morfs` is a list of modules or file names.
 `outfile` is a file object to write the XML to.
 """
 # Initial setup.
 outfile = outfile or sys.stdout
+has_arcs = self.coverage.get_data().has_arcs()
 # Create the DOM that will store the data.
 impl = xml.dom.minidom.getDOMImplementation()
 self.xml_out = impl.createDocument(None, "coverage", None)
 " Generated by coverage.py: %s " % __url__
 ))
 xcoverage.appendChild(self.xml_out.createComment(" Based on %s " % DTD_URL))
 # Call xml_file for each file in the data.
-self.report_files(self.xml_file, morfs)
+for fr, analysis in get_analysis_to_report(self.coverage, morfs):
+self.xml_file(fr, analysis, has_arcs)
 xsources = self.xml_out.createElement("sources")
 xcoverage.appendChild(xsources)
 # Populate the XML DOM with the source info.
 xpackage.appendChild(xclasses)
 for _, class_elt in sorted(iitems(class_elts)):
 xclasses.appendChild(class_elt)
 xpackage.setAttribute("name", pkg_name.replace(os.sep, '.'))
 xpackage.setAttribute("line-rate", rate(lhits, lnum))
-if self.has_arcs:
+if has_arcs:
 branch_rate = rate(bhits, bnum)
 else:
 branch_rate = "0"
 xpackage.setAttribute("branch-rate", branch_rate)
 xpackage.setAttribute("complexity", "0")
 bhits_tot += bhits
 xcoverage.setAttribute("lines-valid", str(lnum_tot))
 xcoverage.setAttribute("lines-covered", str(lhits_tot))
 xcoverage.setAttribute("line-rate", rate(lhits_tot, lnum_tot))
-if self.has_arcs:
+if has_arcs:
 xcoverage.setAttribute("branches-valid", str(bnum_tot))
 xcoverage.setAttribute("branches-covered", str(bhits_tot))
 xcoverage.setAttribute("branch-rate", rate(bhits_tot, bnum_tot))
 else:
 xcoverage.setAttribute("branches-covered", "0")
 pct = 0.0
 else:
 pct = 100.0 * (lhits_tot + bhits_tot) / denom
 return pct
-def xml_file(self, fr, analysis):
+def xml_file(self, fr, analysis, has_arcs):
 """Add to the XML report for a single file."""
 # Create the 'lines' and 'package' XML elements, which
 # are populated later.  Note that a package == a directory.
 filename = fr.filename.replace("\\", "/")
 # Q: can we get info about the number of times a statement is
 # executed?  If so, that should be recorded here.
 xline.setAttribute("hits", str(int(line not in analysis.missing)))
-if self.has_arcs:
+if has_arcs:
 if line in branch_stats:
 total, taken = branch_stats[line]
 xline.setAttribute("branch", "true")
 xline.setAttribute(
 "condition-coverage",
 xlines.appendChild(xline)
 class_lines = len(analysis.statements)
 class_hits = class_lines - len(analysis.missing)
-if self.has_arcs:
+if has_arcs:
 class_branches = sum(t for t, k in branch_stats.values())
 missing_branches = sum(t - k for t, k in branch_stats.values())
 class_br_hits = class_branches - missing_branches
 else:
 class_branches = 0.0
 class_br_hits = 0.0
 # Finalize the statistics that are collected in the XML DOM.
 xclass.setAttribute("line-rate", rate(class_hits, class_lines))
-if self.has_arcs:
+if has_arcs:
 branch_rate = rate(class_br_hits, class_branches)
 else:
 branch_rate = "0"
 xclass.setAttribute("branch-rate", branch_rate)
 def serialize_xml(dom):
 """Serialize a minidom node to XML."""
 out = dom.toprettyxml()
 if env.PY2:
 out = out.encode("utf8")
-# In Python 3.8, minidom lost the sorting of attributes: https://bugs.python.org/issue34160
-# For the limited kinds of XML we produce, this re-sorts them.
-if env.PYVERSION >= (3, 8):
-rx_attr = r' [\w-]+="[^"]*"'
-rx_attrs = r'(' + rx_attr + ')+'
-fixed_lines = []
-for line in out.splitlines(True):
-hollow_line = re.sub(rx_attrs, u"☺", line)
-attrs = sorted(re.findall(rx_attr, line))
-new_line = hollow_line.replace(u"☺", "".join(attrs))
-fixed_lines.append(new_line)
-out = "".join(fixed_lines)
 return out

Mercurial Repositories > eric / file comparison

comparison: eric6/DebugClients/Python/coverage/xmlreport.py

eric6/DebugClients/Python/coverage/xmlreport.py