From 10fc5196335530699d7a9f414d2789d1adc79ff2 Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Wed, 17 Jun 2015 16:39:11 +0100 Subject: [PATCH] Fix bug introduced in 3c40f32fa2c6024716d3fcb0e6b5a66a7ef3dd3a . --- lib/galaxy/tools/parser/xml.py | 3 ++- lib/galaxy/tools/parser/yaml.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/tools/parser/xml.py b/lib/galaxy/tools/parser/xml.py index 2c791cf210e..24fe0aaaaf8 100644 --- a/lib/galaxy/tools/parser/xml.py +++ b/lib/galaxy/tools/parser/xml.py @@ -25,6 +25,7 @@ from galaxy.tools.deps import requirements import galaxy.tools from galaxy.tools.parameters import output_collect from galaxy.tools.parameters import dynamic_options +from galaxy.tools.parameters.output import ToolOutputActionGroup log = logging.getLogger( __name__ ) @@ -236,7 +237,7 @@ class XmlToolSource(ToolSource): output.tool = tool output.from_work_dir = data_elem.get("from_work_dir", None) output.hidden = string_as_bool( data_elem.get("hidden", "") ) - output.actions = galaxy.tools.parameters.output.ToolOutputActionGroup( output, data_elem.find( 'actions' ) ) + output.actions = ToolOutputActionGroup( output, data_elem.find( 'actions' ) ) output.dataset_collectors = output_collect.dataset_collectors_from_elem( data_elem ) return output diff --git a/lib/galaxy/tools/parser/yaml.py b/lib/galaxy/tools/parser/yaml.py index aa19ea77327..97bcb8e3448 100644 --- a/lib/galaxy/tools/parser/yaml.py +++ b/lib/galaxy/tools/parser/yaml.py @@ -6,6 +6,7 @@ from .util import error_on_exit_code from galaxy.tools.deps import requirements from galaxy.tools.parameters import output_collect +from galaxy.tools.parameters.output import ToolOutputActionGroup from galaxy.util.odict import odict import galaxy.tools @@ -87,7 +88,7 @@ class YamlToolSource(ToolSource): output.tool = tool output.from_work_dir = output_dict.get("from_work_dir", None) output.hidden = output_dict.get("hidden", "") - output.actions = galaxy.tools.parameters.output.ToolOutputActionGroup( output, None ) + output.actions = ToolOutputActionGroup( output, None ) discover_datasets_dicts = output_dict.get( "discover_datasets", [] ) if isinstance( discover_datasets_dicts, dict ): discover_datasets_dicts = [ discover_datasets_dicts ]