Merge pull request #9067 from nsoranzo/release_19.05_fix_multiple_select_tool_test

[19.05] Listify value for multiple SelectToolParameterWrapper
This commit is contained in:
Marius van den Beek
2019-12-07 11:31:12 +01:00
committed by GitHub
2 changed files with 6 additions and 1 deletions
+3
View File
@@ -35,6 +35,7 @@ from galaxy.tools.wrappers import (
)
from galaxy.util import (
find_instance_nested,
listify,
unicodify,
)
from galaxy.util.bunch import Bunch
@@ -254,6 +255,8 @@ class ToolEvaluator(object):
)
input_values[input.name] = wrapper
elif isinstance(input, SelectToolParameter):
if input.multiple:
value = listify(value)
input_values[input.name] = SelectToolParameterWrapper(
input, value, other_values=param_dict, path_rewriter=self.unstructured_path_rewriter)
else:
+3 -1
View File
@@ -974,7 +974,9 @@ def listify(item, do_strip=False):
"""
if not item:
return []
elif isinstance(item, list) or isinstance(item, tuple):
elif isinstance(item, list):
return item
elif isinstance(item, tuple):
return list(item)
elif isinstance(item, string_types) and item.count(','):
if do_strip: