diff options
author | Buck Golemon <buck@yelp.com> | 2014-11-14 14:00:27 -0800 |
---|---|---|
committer | Buck Golemon <buck@yelp.com> | 2014-11-14 14:00:27 -0800 |
commit | d05360a060187452f49302467f87ead09d27c9ba (patch) | |
tree | 9e82e20acb7358109ffd77de863088faf7a7c0eb /coverage/files.py | |
parent | a3cb81edd6053a273447ba3821655320ed234a41 (diff) | |
download | python-coveragepy-git-d05360a060187452f49302467f87ead09d27c9ba.tar.gz |
ModuleFinder no longer takes a main-module argument.
--HG--
branch : __main__-support
extra : rebase_source : 3f4c29876960153907b65b6e8e818b8228ca4ec0
extra : histedit_source : 6567adaf9c89483b71501fd91e9d3c83ed3daec7%2C2c5c8a7af95b8b26af384b9a65815d077e4313ec
Diffstat (limited to 'coverage/files.py')
-rw-r--r-- | coverage/files.py | 20 |
1 files changed, 5 insertions, 15 deletions
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 |