summaryrefslogtreecommitdiff
path: root/tox
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2015-06-19 11:13:38 +0200
committerholger krekel <holger@merlinux.eu>2015-06-19 11:13:38 +0200
commitef513813161200205ec89a2d824c0c80466c993f (patch)
tree0b78449509619c950ab9fe25bca62cf048f0ca3c /tox
parent5acb7faa85936e208b17b7ef79618fcb790bafc6 (diff)
parent435c0f3ce28a436fda2464c4200370c35b22c609 (diff)
downloadtox-ef513813161200205ec89a2d824c0c80466c993f.tar.gz
Merged in acaron/tox (pull request #163)
Adds support for multiline envlist setting.
Diffstat (limited to 'tox')
-rw-r--r--tox/config.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/tox/config.py b/tox/config.py
index 062992e..177bfcc 100644
--- a/tox/config.py
+++ b/tox/config.py
@@ -733,6 +733,8 @@ class parseini:
def _split_env(env):
"""if handed a list, action="append" was used for -e """
if not isinstance(env, list):
+ if '\n' in env:
+ env = ','.join(env.split('\n'))
env = [env]
return mapcat(_expand_envstr, env)