Infra/tiramisu
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

validator's function can have 1 arg, 2 args or 3 args

Browse Source
This commit is contained in:
Emmanuel Garette
2017-01-18 15:54:30 +01:00
parent 913a747a2e
commit e2159fd307
4 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tiramisu/error.py
View File

@ -55,7 +55,7 @@ class PropertiesOptionError(AttributeError):
else:
prop_msg = _('properties')
msg = display_list(msg)
return _('cannot access to {0} "{1}" because has {2} {3}').format(self._type, self._datas['opt'].impl_get_display_name(), prop_msg, msg)
return str(_('cannot access to {0} "{1}" because has {2} {3}').format(self._type, self._datas['opt'].impl_get_display_name(), prop_msg, msg))
else:
return super(PropertiesOptionError, self).__str__()

12
tiramisu/option/baseoption.py
View File

@ -175,13 +175,17 @@ class Base(StorageBase):
defaults = []
args = func_args.args[0:len(func_args.args)-len(defaults)]
if validator_params is not None:
kwargs = validator_params.keys()
if '' in kwargs:
kwargs.remove('')
for kwarg in kwargs:
if kwarg in args:
args = args[0:args.index(kwarg)]
len_args = len(validator_params.get('', []))
if len_args != 0 and len(args) <= len_args:
if len_args != 0 and len(args) >= len_args:
args = args[0:len(args)-len_args]
if len(args) >= 2:
if validator_params is not None and args[1] in validator_params:
args = []
elif validator_params is not None and '' in validator_params:
if validator_params is not None and '' in validator_params:
params = list(validator_params[''])
params.append((self, False))
validator_params[''] = tuple(params)