From fa380a00cbb779f5b436e29cba2a466db59db62c Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 19 May 2016 10:49:58 -0400 Subject: [PATCH] Fix assertions for drilldown by raising properly displayed value errors instead --- lib/galaxy/tools/parameters/basic.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py index 996e9e398bc..cbbc91e7a99 100644 --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -1480,10 +1480,11 @@ class DrillDownSelectToolParameter( SelectToolParameter ): return None if not isinstance( value, list ): value = [ value ] - if not( self.repeat ) and len( value ) > 1: - assert self.multiple, "Multiple values provided but parameter %s is not expecting multiple values" % self.name + if not self.repeat and len( value ) > 1 and not self.multiple: + raise ValueError( "Multiple values provided but parameter %s is not expecting multiple values." % self.name ) rval = [] - assert legal_values, "Parameter %s requires a value, but has no legal values defined" % self.name + if not legal_values: + raise ValueError( "Parameter %s requires a value, but has no legal values defined." % self.name ) for val in value: if val not in legal_values: raise ValueError( "An invalid option was selected for %s, %r, please verify" % ( self.name, val ) ) @@ -1520,9 +1521,8 @@ class DrillDownSelectToolParameter( SelectToolParameter ): for val in value: options = get_options_list( val ) rval.extend( options ) - if len( rval ) > 1: - if not self.repeat: - assert self.multiple, "Multiple values provided but parameter is not expecting multiple values" + if not self.repeat and len( rval ) > 1 and not self.multiple: + raise ValueError( "Multiple values provided but parameter %s is not expecting multiple values." % self.name ) rval = self.separator.join( map( value_map, rval ) ) if self.tool is None or self.tool.options.sanitize: if self.sanitizer: