diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2016-01-02 16:28:02 -0500 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2016-01-02 16:28:02 -0500 |
| commit | 705345c15ae80e8b37ad3e21c0411a14cf6a0f78 (patch) | |
| tree | af815ffa147312d7eab498f247d4626f211ecac4 /coverage/parser.py | |
| parent | 255afeb3314da3ad388ac7a3330dd3f94eae0d99 (diff) | |
| parent | aa84ff5b92fd148314cb6119bcc63db53a656b93 (diff) | |
| download | python-coveragepy-705345c15ae80e8b37ad3e21c0411a14cf6a0f78.tar.gz | |
Merge in the default branch
Diffstat (limited to 'coverage/parser.py')
| -rw-r--r-- | coverage/parser.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/coverage/parser.py b/coverage/parser.py index d85f0b5..c11bc22 100644 --- a/coverage/parser.py +++ b/coverage/parser.py @@ -98,7 +98,10 @@ class PythonParser(object): part of it. """ - regex_c = re.compile(join_regex(regexes)) + combined = join_regex(regexes) + if env.PY2: + combined = combined.decode("utf8") + regex_c = re.compile(combined) matches = set() for i, ltext in enumerate(self.lines, start=1): if regex_c.search(ltext): |