summaryrefslogtreecommitdiff
path: root/coverage/misc.py
diff options
context:
space:
mode:
authorDanny Allen <me@dannya.com>2014-08-11 16:13:06 +0100
committerDanny Allen <me@dannya.com>2014-08-11 16:13:06 +0100
commite38016c499921dd7bf5919a699a76305a1936129 (patch)
tree07a4125732561f2489dfb6b75a339cfef46d80d4 /coverage/misc.py
parentc81183f614ca982cd2ed93ac8e6e76610d162202 (diff)
parentee5ea987f8978d91c1ef189fe4f334511ddf6215 (diff)
downloadpython-coveragepy-git-e38016c499921dd7bf5919a699a76305a1936129.tar.gz
Merged ned/coveragepy into default
Diffstat (limited to 'coverage/misc.py')
-rw-r--r--coverage/misc.py2
1 files changed, 1 insertions, 1 deletions
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: