diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2014-06-03 06:37:27 -0400 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2014-06-03 06:37:27 -0400 |
| commit | 357d789ddf413a55326623aed47ad816b3f78071 (patch) | |
| tree | 1620b8ef812c9a90fdd0f72c0553f43ceef40a9d /coverage | |
| parent | 2ecef504147871585ea05b6003bd56794af90ddc (diff) | |
| download | python-coveragepy-git-357d789ddf413a55326623aed47ad816b3f78071.tar.gz | |
Fix the new FnmatchMatcher for >100 patterns
Diffstat (limited to 'coverage')
| -rw-r--r-- | coverage/files.py | 1 | ||||
| -rw-r--r-- | coverage/misc.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/coverage/files.py b/coverage/files.py index 08ce1e84..80b69572 100644 --- a/coverage/files.py +++ b/coverage/files.py @@ -188,6 +188,7 @@ class FnmatchMatcher(object): def match(self, fpath): """Does `fpath` match one of our filename patterns?""" + #print("Matching %r against %r" % (self.re.pattern, fpath)) return self.re.match(fpath) is not None diff --git a/coverage/misc.py b/coverage/misc.py index c88d4ecd..4b1dccb2 100644 --- a/coverage/misc.py +++ b/coverage/misc.py @@ -87,7 +87,7 @@ def bool_or_none(b): def join_regex(regexes): """Combine a list of regexes into one that matches any of them.""" if len(regexes) > 1: - return "|".join("(%s)" % r for r in regexes) + return "|".join("(?:%s)" % r for r in regexes) elif regexes: return regexes[0] else: |
