From f308bfe21c609968c25fa696fb1d35ba3c65b5be Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@nedbatchelder.com>
Date: Mon, 4 May 2009 20:13:25 -0400
Subject: Pass values into coverage's contructor rather than set properties.

---
 coverage/cmdline.py | 7 ++++---
 coverage/control.py | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'coverage')

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()
-- 
cgit v1.2.1