Work on resolving inlinefunc errors #1498
This commit is contained in:
parent
8d7a7490a9
commit
2eaae6ac48
2 changed files with 25 additions and 16 deletions
|
|
@ -87,7 +87,14 @@ def protfunc_parser(value, available_functions=None, **kwargs):
|
|||
if not isinstance(value, basestring):
|
||||
return value
|
||||
available_functions = _PROT_FUNCS if available_functions is None else available_functions
|
||||
result = inlinefuncs.parse_inlinefunc(value, _available_funcs=available_functions, **kwargs)
|
||||
result = inlinefuncs.parse_inlinefunc(value, available_funcs=available_functions, **kwargs)
|
||||
# at this point we have a string where all procfuncs were parsed
|
||||
try:
|
||||
result = literal_eval(result)
|
||||
except ValueError:
|
||||
# this is due to the string not being valid for literal_eval - keep it a string
|
||||
pass
|
||||
|
||||
result = _PROTLIB.value_to_obj_or_any(result)
|
||||
try:
|
||||
return literal_eval(result)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue