diff options
author | Ned Batchelder <ned@nedbatchelder.com> | 2014-11-28 17:18:44 -0500 |
---|---|---|
committer | Ned Batchelder <ned@nedbatchelder.com> | 2014-11-28 17:18:44 -0500 |
commit | 3eac462cfb942b41493eceacf9a1f457d0fab658 (patch) | |
tree | c68a97d7db1273767a11feba9beae3a2d6cd65dd /coverage/control.py | |
parent | 57817442e05ecba7a7e25a1cd60796a42eb37b26 (diff) | |
download | python-coveragepy-git-3eac462cfb942b41493eceacf9a1f457d0fab658.tar.gz |
Rename should_trace and check_include_omit_etc to be more parallel.
Diffstat (limited to 'coverage/control.py')
-rw-r--r-- | coverage/control.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/coverage/control.py b/coverage/control.py index 78d3b0a7..8dd5d08f 100644 --- a/coverage/control.py +++ b/coverage/control.py @@ -205,8 +205,8 @@ class Coverage(object): self.include = prep_patterns(self.config.include) self.collector = Collector( - should_trace=self._should_trace, - check_include=self._tracing_check_include_omit_etc, + should_trace=self._verbose_should_trace, + check_include=self._verbose_check_include_omit_etc, timid=self.config.timid, branch=self.config.branch, warn=self._warn, @@ -343,7 +343,7 @@ class Coverage(object): return dunder_name - def _should_trace_with_reason(self, filename, frame): + def _should_trace(self, filename, frame): """Decide whether to trace execution in `filename`, with a reason. This function is called from the trace function. As each new file name @@ -370,7 +370,7 @@ class Coverage(object): filename = self._source_for_file(dunder_file) if not filename: - # Empty string is pretty useless + # Empty string is pretty useless. return nope(disp, "empty string isn't a filename") if filename.startswith('memory:'): @@ -468,18 +468,18 @@ class Coverage(object): # No reason found to skip this file. return None - def _should_trace(self, filename, frame): + def _verbose_should_trace(self, filename, frame): """Decide whether to trace execution in `filename`. - Calls `_should_trace_with_reason`, and returns the FileDisposition. + Calls `_should_trace`, and returns the FileDisposition. """ - disp = self._should_trace_with_reason(filename, frame) + disp = self._should_trace(filename, frame) if self.debug.should('trace'): self.debug.write(disp.debug_message()) return disp - def _tracing_check_include_omit_etc(self, filename, frame): + def _verbose_check_include_omit_etc(self, filename, frame): """Check a filename against the include/omit/etc, rules, verbosely. Returns a boolean: True if the file should be traced, False if not. |