move risky things out of the constructor and into the method called in a try catch block

Author: Bachmann1234

coverage/jsonreport.py

@@ -20,8 +20,6 @@ def __init__(self, coverage):
         self.config = self.coverage.config
         self.total = Numbers()
         self.report_data = {}
-        self.data = self.coverage.get_data()
-        self.has_arcs = self.data.has_arcs()
 
     def report(self, morfs, outfile=None):
         """Generate a json report for `morfs`.
@@ -32,17 +30,19 @@ def report(self, morfs, outfile=None):
 
         """
         outfile = outfile or sys.stdout
-        self.data.set_query_contexts(self.config.report_contexts)
+        coverage_data = self.coverage.get_data()
+        coverage_data.set_query_contexts(self.config.report_contexts)
         self.report_data["meta"] = {
             "version": __version__,
             "timestamp": datetime.datetime.now().isoformat(),
-            "branch_coverage": self.data.has_arcs(),
+            "branch_coverage": coverage_data.has_arcs(),
             "show_contexts": self.config.json_show_contexts,
         }
 
         measured_files = {}
         for file_reporter, analysis in get_analysis_to_report(self.coverage, morfs):
             measured_files[file_reporter.relative_filename()] = self.report_one_file(
+                coverage_data,
                 file_reporter,
                 analysis
             )
@@ -56,7 +56,7 @@ def report(self, morfs, outfile=None):
             'missing_lines': self.total.n_missing,
         }
 
-        if self.data.has_arcs():
+        if coverage_data.has_arcs():
             self.report_data["totals"].update({
                 'num_branches': self.total.n_branches,
                 'num_partial_branches': self.total.n_partial_branches,
@@ -70,7 +70,7 @@ def report(self, morfs, outfile=None):
 
         return self.total.n_statements and self.total.pc_covered
 
-    def report_one_file(self, file_reporter, analysis):
+    def report_one_file(self, coverage_data, file_reporter, analysis):
         """Extract the relevant report data for a single file"""
         nums = analysis.numbers
         self.total += nums
@@ -89,7 +89,7 @@ def report_one_file(self, file_reporter, analysis):
             reported_file['contexts'] = analysis.data.contexts_by_lineno(
                 file_reporter.filename
             )
-        if self.data.has_arcs():
+        if coverage_data.has_arcs():
             reported_file['summary'].update({
                 'num_branches': nums.n_branches,
                 'num_partial_branches': nums.n_partial_branches,

coverage/xmlreport.py

@@ -44,8 +44,6 @@ def __init__(self, coverage):
                     self.source_paths.add(files.canonical_filename(src))
         self.packages = {}
         self.xml_out = None
-        self.data = coverage.get_data()
-        self.has_arcs = self.data.has_arcs()
 
     def report(self, morfs, outfile=None):
         """Generate a Cobertura-compatible XML report for `morfs`.
@@ -57,6 +55,7 @@ def report(self, morfs, outfile=None):
         """
         # 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()
@@ -73,7 +72,7 @@ def report(self, morfs, outfile=None):
 
         # Call xml_file for each file in the data.
         for fr, analysis in get_analysis_to_report(self.coverage, morfs):
-            self.xml_file(fr, analysis)
+            self.xml_file(fr, analysis, has_arcs)
 
         xsources = self.xml_out.createElement("sources")
         xcoverage.appendChild(xsources)
@@ -102,7 +101,7 @@ def report(self, morfs, outfile=None):
                 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"
@@ -117,7 +116,7 @@ def report(self, morfs, outfile=None):
         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))
@@ -138,7 +137,7 @@ def report(self, morfs, outfile=None):
             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
@@ -182,7 +181,7 @@ def xml_file(self, fr, analysis):
             # 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")
@@ -198,7 +197,7 @@ def xml_file(self, fr, analysis):
         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
@@ -208,7 +207,7 @@ def xml_file(self, fr, analysis):
 
         # 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"