diff --git a/lib/galaxy/tools/parameters/__init__.py b/lib/galaxy/tools/parameters/__init__.py index 0e2e51af2c7..a2d0a407595 100644 --- a/lib/galaxy/tools/parameters/__init__.py +++ b/lib/galaxy/tools/parameters/__init__.py @@ -24,7 +24,7 @@ def visit_input_values( inputs, input_values, callback, name_prefix='', label_pr >>> from xml.etree.ElementTree import XML >>> from galaxy.util.bunch import Bunch >>> from galaxy.util.odict import odict - >>> from galaxy.tools.parameters.basic import TextToolParameter + >>> from galaxy.tools.parameters.basic import TextToolParameter, BooleanToolParameter >>> from galaxy.tools.parameters.grouping import Repeat >>> a = TextToolParameter( None, XML( '' ) ) >>> b = Repeat() @@ -32,7 +32,7 @@ def visit_input_values( inputs, input_values, callback, name_prefix='', label_pr >>> d = Repeat() >>> e = TextToolParameter( None, XML( '' ) ) >>> f = Conditional() - >>> g = TextToolParameter( None, XML( '' ) ) + >>> g = BooleanToolParameter( None, XML( '' ) ) >>> h = TextToolParameter( None, XML( '' ) ) >>> i = TextToolParameter( None, XML( '' ) ) >>> b.name = 'b' @@ -45,12 +45,16 @@ def visit_input_values( inputs, input_values, callback, name_prefix='', label_pr >>> >>> def visitor( input, value, prefix, prefixed_name, **kwargs ): ... print 'name=%s, prefix=%s, prefixed_name=%s, value=%s' % ( input.name, prefix, prefixed_name, value ) - >>> visit_input_values( odict([('a',a),('b',b)]), odict([ ('a', 1), ('b', [ odict([('c', 3), ( 'd', [odict([ ('e',5), ('f', odict([ ('g','true'), ('h',7) ])) ]) ])]) ]) ]), visitor ) + >>> inputs = odict([('a',a),('b',b)]) + >>> nested = odict([ ('a', 1), ('b', [ odict([('c', 3), ( 'd', [odict([ ('e', 5), ('f', odict([ ('g', True), ('h', 7) ])) ]) ])]) ]) ]) + >>> visit_input_values( inputs, nested, visitor ) name=a, prefix=, prefixed_name=a, value=1 name=c, prefix=b_0|, prefixed_name=b_0|c, value=3 name=e, prefix=b_0|d_0|, prefixed_name=b_0|d_0|e, value=5 - name=g, prefix=b_0|d_0|, prefixed_name=b_0|d_0|f|g, value=true + name=g, prefix=b_0|d_0|, prefixed_name=b_0|d_0|f|g, value=True name=h, prefix=b_0|d_0|, prefixed_name=b_0|d_0|f|h, value=7 + >>> params_from_strings( inputs, params_to_strings( inputs, nested, None ), None )[ 'b' ][ 0 ][ 'd' ][ 0 ][ 'f' ][ 'g' ] is True + True """ def callback_helper( input, input_values, name_prefix, label_prefix, parent_prefix, context=None, error=None ): args = {