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
commit139497ac9cf495a13e9f3323db489bf56054f5d4 (patch)
treeeae49dfbee407d333ef61618351936ded5945297 /coverage/misc.py
parent61deec574e9d0181ad986d1276e3d57e8427930d (diff)
downloadpython-coveragepy-git-139497ac9cf495a13e9f3323db489bf56054f5d4.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 ec0d0ff7..fd9be857 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):