diff options
| -rw-r--r-- | coverage/cmdline.py | 14 | ||||
| -rw-r--r-- | coverage/control.py | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/coverage/cmdline.py b/coverage/cmdline.py index e6a6d812..140de1d8 100644 --- a/coverage/cmdline.py +++ b/coverage/cmdline.py @@ -2,9 +2,6 @@ import getopt, sys -from coverage.annotate import AnnotateReporter -from coverage.html import HtmlReporter -from coverage.summary import SummaryReporter from coverage.execfile import run_python_file USAGE = r""" @@ -150,16 +147,11 @@ class CoverageScript: omit = omit.split(',') if settings.get('report'): - reporter = SummaryReporter( - self.coverage, show_missing, ignore_errors - ) - reporter.report(args, omit_prefixes=omit) + self.coverage.report(morfs=args, show_missing=show_missing, ignore_errors=ignore_errors, omit_prefixes=omit) if settings.get('annotate'): - reporter = AnnotateReporter(self.coverage, ignore_errors) - reporter.report(args, directory, omit_prefixes=omit) + self.coverage.annotate(morfs=args, directory=directory, ignore_errors=ignore_errors, omit_prefixes=omit) if settings.get('html'): - reporter = HtmlReporter(self.coverage, ignore_errors) - reporter.report(args, directory, omit_prefixes=omit) + self.coverage.html_report(morfs=args, directory=directory, ignore_errors=ignore_errors, omit_prefixes=omit) return OK diff --git a/coverage/control.py b/coverage/control.py index e3053e49..eb9d6b39 100644 --- a/coverage/control.py +++ b/coverage/control.py @@ -6,6 +6,7 @@ from coverage.annotate import AnnotateReporter from coverage.codeunit import code_unit_factory from coverage.data import CoverageData from coverage.files import FileLocator +from coverage.html import HtmlReporter from coverage.misc import format_lines, CoverageException from coverage.summary import SummaryReporter @@ -161,7 +162,7 @@ class coverage: statements, excluded, missing, format_lines(statements, missing) ) - def report(self, morfs, show_missing=True, ignore_errors=False, file=None): + def report(self, morfs, show_missing=True, ignore_errors=False, file=None, omit_prefixes=None): """Write a summary report to `file`. Each module in `morfs` is listed, with counts of statements, executed @@ -169,9 +170,9 @@ class coverage: """ reporter = SummaryReporter(self, show_missing, ignore_errors) - reporter.report(morfs, outfile=file) + reporter.report(morfs, outfile=file, omit_prefixes=omit_prefixes) - def annotate(self, morfs, directory=None, ignore_errors=False): + def annotate(self, morfs, directory=None, ignore_errors=False, omit_prefixes=None): """Annotate a list of modules. Each module in `morfs` is annotated. The source is written to a new @@ -182,3 +183,10 @@ class coverage: """ reporter = AnnotateReporter(self, ignore_errors) reporter.report(morfs, directory) + + def html_report(self, morfs, directory=None, ignore_errors=False, omit_prefixes=None): + """Generate an HTML report. + + """ + reporter = HtmlReporter(self, ignore_errors) + reporter.report(morfs, outfile=file, omit_prefixes=omit_prefixes) |