Skip to content

Commit

Permalink
Fix lint issues
Browse files Browse the repository at this point in the history
  • Loading branch information
guerler committed Feb 11, 2017
1 parent eb95131 commit d298c1c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 0 additions & 1 deletion lib/galaxy/model/__init__.py
Expand Up @@ -34,7 +34,6 @@
from galaxy.util.bunch import Bunch
from galaxy.util.dictifiable import Dictifiable
from galaxy.util.hash_util import new_secure_hash
from galaxy.util.json import safe_loads
from galaxy.util.multi_byte import is_multi_byte
from galaxy.util.sanitize_html import sanitize_html
from galaxy.web.form_builder import (AddressField, CheckboxField, HistoryField,
Expand Down
6 changes: 4 additions & 2 deletions lib/galaxy/tools/parameters/__init__.py
Expand Up @@ -215,6 +215,7 @@ def update_param( prefixed_name, input_values, new_value ):
elif prefixed_name == key:
input_values[ key ] = new_value


def populate_state( request_context, inputs, incoming, state, errors={}, prefix='', context=None, check=True ):
"""
Populates nested state dict from incoming parameter values.
Expand Down Expand Up @@ -243,7 +244,7 @@ def populate_state( request_context, inputs, incoming, state, errors={}, prefix=
else:
test_param_key = group_prefix + input.test_param.name
test_param_value = incoming.get( test_param_key, group_state.get( input.test_param.name ) )
value, error = check_param( request_context, input.test_param, test_param_value, context ) if check else [ test_param_value, None ]
value, error = check_param( request_context, input.test_param, test_param_value, context ) if check else [ test_param_value, None ]
if error:
errors[ test_param_key ] = error
else:
Expand Down Expand Up @@ -279,6 +280,7 @@ def populate_state( request_context, inputs, incoming, state, errors={}, prefix=
errors[ key ] = error
state[ input.name ] = value


def _get_incoming_value( incoming, key, default ):
"""
Fetch value from incoming dict directly or check special nginx upload
Expand All @@ -291,4 +293,4 @@ def _get_incoming_value( incoming, key, default ):
value[ composite_key ] = incoming[ key + '_' + composite_key ]
return value
else:
return incoming.get( key, default )
return incoming.get( key, default )

0 comments on commit d298c1c

Please sign in to comment.