diff options
Diffstat (limited to 'coverage')
| -rw-r--r-- | coverage/cmdline.py | 3 | ||||
| -rw-r--r-- | coverage/control.py | 5 | ||||
| -rw-r--r-- | coverage/files.py | 20 |
3 files changed, 8 insertions, 20 deletions
diff --git a/coverage/cmdline.py b/coverage/cmdline.py index a80d1168..e7efe5c4 100644 --- a/coverage/cmdline.py +++ b/coverage/cmdline.py @@ -519,10 +519,9 @@ class CoverageScript(object): # Set the first path element properly. old_path0 = sys.path[0] - main_module = args[0] if options.module else None # Run the script. - self.coverage.start(main_module=main_module) + self.coverage.start() code_ran = True try: if options.module: diff --git a/coverage/control.py b/coverage/control.py index 5e154537..47e5b508 100644 --- a/coverage/control.py +++ b/coverage/control.py @@ -141,7 +141,7 @@ class Coverage(object): # Other instance attributes, set later. self.omit = self.include = self.source = None - self.not_imported = self.source_pkgs = self.file_locator = None + self.source_pkgs = self.file_locator = None self.data = self.collector = None self.plugins = self.file_tracers = None self.pylib_dirs = self.cover_dir = None @@ -426,8 +426,7 @@ class Coverage(object): # any canned exclusions. If they didn't, then we have to exclude the # stdlib and coverage.py directories. if self.source_match: - match = self.source_pkgs_match.match(modulename) - if match: + if self.source_pkgs_match.match(modulename): if modulename in self.not_imported: self.not_imported.remove(modulename) return None # There's no reason to skip this file. diff --git a/coverage/files.py b/coverage/files.py index 5e7c35aa..97888b62 100644 --- a/coverage/files.py +++ b/coverage/files.py @@ -175,21 +175,16 @@ class TreeMatcher(object): class ModuleMatcher(object): """A matcher for files in a tree.""" - def __init__(self, module_names, main_module=None): + def __init__(self, module_names): self.modules = list(module_names) - self.main_module = main_module self.not_imported = list(module_names) def __repr__(self): - if self.main_module: - main_module = ', main_module=%r' % self.main_module - else: - main_module = '' - return "<ModuleMatcher %r%s>" % (self.modules, main_module) + return "<ModuleMatcher %r>" % (self.modules) def info(self): """A list of strings for displaying when dumping state.""" - return ['main_module=%r' % self.main_module] + self.modules + return self.modules def add(self, module): """Add another directory to the list we match for.""" @@ -197,22 +192,17 @@ class ModuleMatcher(object): def match(self, module_name): """Does `module_name` indicate a module in one of our packages? - - On success, returns the matched module name, which can be different in - the case of __main__. """ if not module_name: return False - elif module_name == '__main__': - module_name = self.main_module or module_name for m in self.modules: if module_name.startswith(m): if module_name == m: - return module_name + return True if module_name[len(m)] == '.': # This is a module in the package - return module_name + return True return False |