error in external function should returns only ConfigError

This commit is contained in:
2017-02-12 10:38:57 +01:00
parent 80f6f4ba03
commit 5bf75b3824
6 changed files with 45 additions and 15 deletions

View File

@ -260,6 +260,16 @@ def calculate(option, callback, is_validator, args, kwargs):
error = err
except Exception as err:
error = err
raise error.__class__(_('function "{0}" returns "{1}" for option "{2}"').format(callback.func_name,
option.impl_get_display_name(),
str(err)))
if len(args) != 0 or len(kwargs) != 0:
msg = _('unexpected error "{0}" in function "{1}" with arguments "{3}" and "{4}" '
'for option "{2}"').format(str(error),
callback.func_name,
option.impl_get_display_name(),
args,
kwargs)
else:
msg = _('unexpected error "{0}" in function "{1}" for option "{2}"'
'').format(str(error),
callback.func_name,
option.impl_get_display_name())
raise ConfigError(msg)