summaryrefslogtreecommitdiff
path: root/coverage/misc.py
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2011-05-31 23:12:40 -0400
committerNed Batchelder <ned@nedbatchelder.com>2011-05-31 23:12:40 -0400
commit90df419fb875c0bd8e1f5534a16441e0caeef1b8 (patch)
tree68ad41c6b664a7d4f76d1e2de691e5f27836b63a /coverage/misc.py
parent5055b918685108814f1850a227402576ad66074b (diff)
downloadpython-coveragepy-90df419fb875c0bd8e1f5534a16441e0caeef1b8.tar.gz
Better handling of the partial-branch exclusion regexes. Finishes issue #113.
Diffstat (limited to 'coverage/misc.py')
-rw-r--r--coverage/misc.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/coverage/misc.py b/coverage/misc.py
index ec0d0ff..fd9be85 100644
--- a/coverage/misc.py
+++ b/coverage/misc.py
@@ -77,8 +77,10 @@ def join_regex(regexes):
"""Combine a list of regexes into one that matches any of them."""
if len(regexes) > 1:
return "(" + ")|(".join(regexes) + ")"
- else:
+ elif regexes:
return regexes[0]
+ else:
+ return ""
class Hasher(object):