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 | a0aa685214e9cccc361cddafea937346bd6dfdad (patch) | |
| tree | c089983f78e4d1a13282b28407450631c89ed64d /coverage/parser.py | |
| parent | 3440e214df5ddd0f507ecd76c2350eb8d9dd6a75 (diff) | |
| parent | 8b110d3a3f7fbddfcbdaa1b090776e0f388a312e (diff) | |
| download | python-coveragepy-git-a0aa685214e9cccc361cddafea937346bd6dfdad.tar.gz | |
Merge in the default branch
--HG--
branch : ast-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 d85f0b57..c11bc222 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): |