diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2015-05-17 18:36:30 -0400 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2015-05-17 18:36:30 -0400 |
| commit | ca1a24ac46844ef83a7c1491659a1f36c8df37b1 (patch) | |
| tree | 8ec4f7348cec7e561b983cb30ee01f8990cc557a /coverage/control.py | |
| parent | ccc1b37086e04d65fbac880248fca3f57b42b901 (diff) | |
| download | python-coveragepy-git-ca1a24ac46844ef83a7c1491659a1f36c8df37b1.tar.gz | |
Use PyContracts so we can declare/enforce parameter and return types.
This commit doesn't add any uses of PyContracts, but gets the machinery in
place.
Diffstat (limited to 'coverage/control.py')
| -rw-r--r-- | coverage/control.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/coverage/control.py b/coverage/control.py index 2c8d384e..defba56c 100644 --- a/coverage/control.py +++ b/coverage/control.py @@ -169,7 +169,7 @@ class Coverage(object): self.source_pkgs = self.file_locator = None self.data = self.collector = None self.plugins = self.file_tracing_plugins = None - self.pylib_dirs = self.cover_dir = None + self.pylib_dirs = self.cover_dirs = None self.data_suffix = self.run_suffix = None self._exclude_re = None self.debug = None @@ -301,7 +301,12 @@ class Coverage(object): # To avoid tracing the coverage code itself, we skip anything located # where we are. - self.cover_dir = self._canonical_dir(__file__) + self.cover_dirs = [self._canonical_dir(__file__)] + if env.TESTING: + # When testing, we use PyContracts, which should be considered + # part of coverage. + import contracts + self.cover_dirs.append(self._canonical_dir(contracts)) # Set the reporting precision. Numbers.set_precision(self.config.precision) @@ -315,8 +320,8 @@ class Coverage(object): self.source_match = TreeMatcher(self.source) self.source_pkgs_match = ModuleMatcher(self.source_pkgs) else: - if self.cover_dir: - self.cover_match = TreeMatcher([self.cover_dir]) + if self.cover_dirs: + self.cover_match = TreeMatcher(self.cover_dirs) if self.pylib_dirs: self.pylib_match = TreeMatcher(self.pylib_dirs) if self.include: @@ -1033,7 +1038,7 @@ class Coverage(object): info = [ ('version', covmod.__version__), ('coverage', covmod.__file__), - ('cover_dir', self.cover_dir), + ('cover_dirs', self.cover_dirs), ('pylib_dirs', self.pylib_dirs), ('tracer', self.collector.tracer_name()), ('file_tracing_plugins', ft_plugins), |