Use basic parameter handler to ensure proper text type value decoding

galaxyproject · Feb 4, 2017 · 39eb33f · 39eb33f
1 parent 26a1844
commit 39eb33f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/lib/galaxy/tools/parameters/__init__.py b/lib/galaxy/tools/parameters/__init__.py
@@ -163,11 +163,6 @@ def params_from_strings( params, param_values, app, ignore_errors=False ):
     param_values = param_values or {}
     for key, value in param_values.items():
         value = json_fix( safe_loads( value ) )
-        try:
-            float( value )
-            value = str( value )
-        except:
-            pass
         if key in params:
             value = params[ key ].value_from_basic( value, app, ignore_errors )
         rval[ key ] = value

diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py
@@ -809,6 +809,8 @@ def from_json( self, value, trans, other_values={} ):
             if isinstance( context_value, RuntimeValue ):
                 workflow_building_mode = True
                 break
+        if value is not None and not isinstance( value, object ):
+            value = str( value )
         if len( list( legal_values ) ) == 0 and workflow_building_mode:
             if self.multiple:
                 # While it is generally allowed that a select value can be '',