diff options
author | Ned Batchelder <ned@nedbatchelder.com> | 2009-05-04 20:13:25 -0400 |
---|---|---|
committer | Ned Batchelder <ned@nedbatchelder.com> | 2009-05-04 20:13:25 -0400 |
commit | f308bfe21c609968c25fa696fb1d35ba3c65b5be (patch) | |
tree | 52f6553c53248c00ed1a326c8fc6c8cf0d0314be | |
parent | 80132a0b9faad6de95828bb85e23271506aa3a4f (diff) | |
download | python-coveragepy-git-f308bfe21c609968c25fa696fb1d35ba3c65b5be.tar.gz |
Pass values into coverage's contructor rather than set properties.
-rw-r--r-- | coverage/cmdline.py | 7 | ||||
-rw-r--r-- | coverage/control.py | 6 | ||||
-rw-r--r-- | test/test_api.py | 3 |
3 files changed, 8 insertions, 8 deletions
diff --git a/coverage/cmdline.py b/coverage/cmdline.py index dae3adf8..6086c62d 100644 --- a/coverage/cmdline.py +++ b/coverage/cmdline.py @@ -58,7 +58,6 @@ class CoverageScript: def __init__(self): import coverage self.covpkg = coverage - self.coverage = coverage.coverage() def help(self, error=None): """Display an error message, or the usage for Coverage.""" @@ -136,8 +135,10 @@ class CoverageScript: return ERR # Do something. - self.coverage.parallel_mode = settings.get('parallel-mode') - self.coverage.cover_stdlib = settings.get('stdlib') + self.coverage = self.covpkg.coverage( + parallel_mode = settings.get('parallel-mode'), + cover_stdlib = settings.get('stdlib') + ) self.coverage.get_ready() if settings.get('erase'): diff --git a/coverage/control.py b/coverage/control.py index 54b2f33c..eca271f4 100644 --- a/coverage/control.py +++ b/coverage/control.py @@ -11,13 +11,13 @@ from coverage.misc import format_lines, CoverageException from coverage.summary import SummaryReporter class coverage: - def __init__(self): + def __init__(self, parallel_mode=False, cover_stdlib=False): from coverage.collector import Collector from coverage import __version__ - self.parallel_mode = False + self.parallel_mode = parallel_mode + self.cover_stdlib = cover_stdlib self.exclude_re = '' - self.cover_stdlib = False self.nesting = 0 self.file_locator = FileLocator() diff --git a/test/test_api.py b/test/test_api.py index 7e363fd5..47dc3d08 100644 --- a/test/test_api.py +++ b/test/test_api.py @@ -163,8 +163,7 @@ class ApiTest(CoverageTest): self.assertEqual(statements, missing) # Measure with the stdlib. - cov2 = coverage.coverage() - cov2.cover_stdlib = True + cov2 = coverage.coverage(cover_stdlib=True) cov2.start() self.importModule("mymain") cov2.stop() |