diff options
Diffstat (limited to 'coverage')
| -rw-r--r-- | coverage/collector.py | 2 | ||||
| -rw-r--r-- | coverage/ctracer/tracer.c | 4 | ||||
| -rw-r--r-- | coverage/ctracer/tracer.h | 2 | ||||
| -rw-r--r-- | coverage/html.py | 10 | ||||
| -rw-r--r-- | coverage/htmlfiles/index.html | 8 | ||||
| -rw-r--r-- | coverage/htmlfiles/pyfile.html | 2 | ||||
| -rw-r--r-- | coverage/pytracer.py | 8 | ||||
| -rw-r--r-- | coverage/xmlreport.py | 12 |
8 files changed, 24 insertions, 24 deletions
diff --git a/coverage/collector.py b/coverage/collector.py index ff7400e8..48b017ce 100644 --- a/coverage/collector.py +++ b/coverage/collector.py @@ -190,7 +190,7 @@ class Collector(object): """Start a new Tracer object, and store it in self.tracers.""" tracer = self._trace_class() tracer.data = self.data - tracer.arcs = self.branch + tracer.trace_arcs = self.branch tracer.should_trace = self.should_trace tracer.should_trace_cache = self.should_trace_cache tracer.warn = self.warn diff --git a/coverage/ctracer/tracer.c b/coverage/ctracer/tracer.c index 586bddc0..933f3cfd 100644 --- a/coverage/ctracer/tracer.c +++ b/coverage/ctracer/tracer.c @@ -911,7 +911,7 @@ CTracer_start(CTracer *self, PyObject *args_unused) { PyEval_SetTrace((Py_tracefunc)CTracer_trace, (PyObject*)self); self->started = 1; - self->tracing_arcs = self->arcs && PyObject_IsTrue(self->arcs); + self->tracing_arcs = self->trace_arcs && PyObject_IsTrue(self->trace_arcs); self->cur_entry.last_line = -1; /* start() returns a trace function usable with sys.settrace() */ @@ -976,7 +976,7 @@ CTracer_members[] = { { "should_trace_cache", T_OBJECT, offsetof(CTracer, should_trace_cache), 0, PyDoc_STR("Dictionary caching should_trace results.") }, - { "arcs", T_OBJECT, offsetof(CTracer, arcs), 0, + { "trace_arcs", T_OBJECT, offsetof(CTracer, trace_arcs), 0, PyDoc_STR("Should we trace arcs, or just lines?") }, { NULL } diff --git a/coverage/ctracer/tracer.h b/coverage/ctracer/tracer.h index e6c0d669..9f17e03e 100644 --- a/coverage/ctracer/tracer.h +++ b/coverage/ctracer/tracer.h @@ -24,7 +24,7 @@ typedef struct CTracer { PyObject * data; PyObject * file_tracers; PyObject * should_trace_cache; - PyObject * arcs; + PyObject * trace_arcs; /* Has the tracer been started? */ int started; diff --git a/coverage/html.py b/coverage/html.py index 3c5e3b46..3a6c61c8 100644 --- a/coverage/html.py +++ b/coverage/html.py @@ -92,7 +92,7 @@ class HtmlReporter(Reporter): 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() @@ -179,7 +179,7 @@ class HtmlReporter(Reporter): # 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. @@ -201,7 +201,7 @@ class HtmlReporter(Reporter): 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) shorts = [] longs = [] @@ -250,7 +250,7 @@ class HtmlReporter(Reporter): # Write the HTML page for this file. 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, 'fr': fr, 'nums': nums, 'lines': lines, 'time_stamp': self.time_stamp, } @@ -276,7 +276,7 @@ class HtmlReporter(Reporter): 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, diff --git a/coverage/htmlfiles/index.html b/coverage/htmlfiles/index.html index 25ced0eb..ee2deab0 100644 --- a/coverage/htmlfiles/index.html +++ b/coverage/htmlfiles/index.html @@ -44,7 +44,7 @@ <span class="key">s</span> <span class="key">m</span> <span class="key">x</span> - {% if arcs %} + {% if has_arcs %} <span class="key">b</span> <span class="key">p</span> {% endif %} @@ -62,7 +62,7 @@ <th class="shortkey_s">statements</th> <th class="shortkey_m">missing</th> <th class="shortkey_x">excluded</th> - {% if arcs %} + {% if has_arcs %} <th class="shortkey_b">branches</th> <th class="shortkey_p">partial</th> {% endif %} @@ -76,7 +76,7 @@ <td>{{totals.n_statements}}</td> <td>{{totals.n_missing}}</td> <td>{{totals.n_excluded}}</td> - {% if arcs %} + {% if has_arcs %} <td>{{totals.n_branches}}</td> <td>{{totals.n_partial_branches}}</td> {% endif %} @@ -90,7 +90,7 @@ <td>{{file.nums.n_statements}}</td> <td>{{file.nums.n_missing}}</td> <td>{{file.nums.n_excluded}}</td> - {% if arcs %} + {% if has_arcs %} <td>{{file.nums.n_branches}}</td> <td>{{file.nums.n_partial_branches}}</td> {% endif %} diff --git a/coverage/htmlfiles/pyfile.html b/coverage/htmlfiles/pyfile.html index 7bf9f554..ad7969db 100644 --- a/coverage/htmlfiles/pyfile.html +++ b/coverage/htmlfiles/pyfile.html @@ -37,7 +37,7 @@ <span class="{{c_mis}} shortkey_m button_toggle_mis">{{nums.n_missing}} missing</span> <span class="{{c_exc}} shortkey_x button_toggle_exc">{{nums.n_excluded}} excluded</span> - {% if arcs %} + {% if has_arcs %} <span class="{{c_par}} shortkey_p button_toggle_par">{{nums.n_partial_branches}} partial</span> {% endif %} </h2> diff --git a/coverage/pytracer.py b/coverage/pytracer.py index c657ad01..94b8231e 100644 --- a/coverage/pytracer.py +++ b/coverage/pytracer.py @@ -36,7 +36,7 @@ class PyTracer(object): def __init__(self): # Attributes set from the collector: self.data = None - self.arcs = False + self.trace_arcs = False self.should_trace = None self.should_trace_cache = None self.warn = None @@ -68,7 +68,7 @@ class PyTracer(object): if self.last_exc_back: if frame == self.last_exc_back: # Someone forgot a return event. - if self.arcs and self.cur_file_dict: + if self.trace_arcs and self.cur_file_dict: pair = (self.last_line, -self.last_exc_firstlineno) self.cur_file_dict[pair] = None self.cur_file_dict, self.last_line = self.data_stack.pop() @@ -99,13 +99,13 @@ class PyTracer(object): # Record an executed line. if self.cur_file_dict is not None: lineno = frame.f_lineno - if self.arcs: + if self.trace_arcs: self.cur_file_dict[(self.last_line, lineno)] = None else: self.cur_file_dict[lineno] = None self.last_line = lineno elif event == 'return': - if self.arcs and self.cur_file_dict: + if self.trace_arcs and self.cur_file_dict: # Record an arc leaving the function, but beware that a # "return" event might just mean yielding from a generator. bytecode = frame.f_code.co_code[frame.f_lasti] diff --git a/coverage/xmlreport.py b/coverage/xmlreport.py index b60cecd2..1f452c5c 100644 --- a/coverage/xmlreport.py +++ b/coverage/xmlreport.py @@ -35,7 +35,7 @@ class XmlReporter(Reporter): self.source_paths = set() self.packages = {} self.xml_out = None - self.arcs = coverage.data.has_arcs() + self.has_arcs = coverage.data.has_arcs() def report(self, morfs, outfile=None): """Generate a Cobertura-compatible XML report for `morfs`. @@ -92,7 +92,7 @@ class XmlReporter(Reporter): xclasses.appendChild(class_elts[class_name]) xpackage.setAttribute("name", pkg_name.replace(os.sep, '.')) xpackage.setAttribute("line-rate", rate(lhits, lnum)) - if self.arcs: + if self.has_arcs: branch_rate = rate(bhits, bnum) else: branch_rate = "0" @@ -105,7 +105,7 @@ class XmlReporter(Reporter): bhits_tot += bhits xcoverage.setAttribute("line-rate", rate(lhits_tot, lnum_tot)) - if self.arcs: + if self.has_arcs: branch_rate = rate(bhits_tot, bnum_tot) else: branch_rate = "0" @@ -161,7 +161,7 @@ class XmlReporter(Reporter): # executed? If so, that should be recorded here. xline.setAttribute("hits", str(int(line not in analysis.missing))) - if self.arcs: + if self.has_arcs: if line in branch_stats: total, taken = branch_stats[line] xline.setAttribute("branch", "true") @@ -177,7 +177,7 @@ class XmlReporter(Reporter): class_lines = len(analysis.statements) class_hits = class_lines - len(analysis.missing) - if self.arcs: + if self.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 @@ -187,7 +187,7 @@ class XmlReporter(Reporter): # Finalize the statistics that are collected in the XML DOM. xclass.setAttribute("line-rate", rate(class_hits, class_lines)) - if self.arcs: + if self.has_arcs: branch_rate = rate(class_br_hits, class_branches) else: branch_rate = "0" |