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

optimise mandatory_warnings

Browse Source
This commit is contained in:
Emmanuel Garette
2015-10-29 09:03:13 +01:00
parent 64e9171ea6
commit a0de1109f7
7 changed files with 307 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tiramisu/option/masterslave.py
View File

@ -115,25 +115,25 @@ class MasterSlaves(object):
def getitem(self, values, opt, path, validate, force_permissive,
force_properties, validate_properties, slave_path=undefined,
slave_value=undefined, setting_properties=undefined, settings=undefined):
slave_value=undefined, setting_properties=undefined, self_properties=undefined):
if self.is_master(opt):
return self._getmaster(values, opt, path, validate,
force_permissive, force_properties,
validate_properties, slave_path,
slave_value, settings)
slave_value, self_properties)
else:
return self._getslave(values, opt, path, validate,
force_permissive, force_properties,
validate_properties, setting_properties, settings)
validate_properties, setting_properties, self_properties)
def _getmaster(self, values, opt, path, validate, force_permissive,
force_properties, validate_properties, c_slave_path,
c_slave_value, settings):
c_slave_value, self_properties):
value = values._get_validated_value(opt, path, validate,
force_permissive,
force_properties,
validate_properties,
settings=settings)
self_properties=self_properties)
if validate is True:
masterlen = len(value)
for slave in self.getslaves(opt):
@ -148,7 +148,7 @@ class MasterSlaves(object):
False,
None, False,
None,
settings=settings)
self_properties=self_properties)
slavelen = len(slave_value)
self.validate_slave_length(masterlen, slavelen, slave.impl_getname(), opt)
except ConfigError: # pragma: optional cover
@ -157,7 +157,7 @@ class MasterSlaves(object):
def _getslave(self, values, opt, path, validate, force_permissive,
force_properties, validate_properties, setting_properties,
settings):
self_properties):
"""
if master has length 0:
return []
@ -192,7 +192,7 @@ class MasterSlaves(object):
validate_properties,
None, # not undefined
with_meta=master_is_meta,
settings=settings)
self_properties=self_properties)
#if slave, had values until master's one
path = opt.impl_getpath(context)
valuelen = len(value)
@ -207,7 +207,7 @@ class MasterSlaves(object):
validate_properties=False,
with_meta=master_is_meta,
index=index,
settings=settings),
self_properties=self_properties),
setitem=False,
force=True,
validate=validate)
@ -218,7 +218,7 @@ class MasterSlaves(object):
path=path,
force_permissive=force_permissive,
force_properties=force_properties,
self_properties=setting_properties)
setting_properties=setting_properties)
return value
def setitem(self, values, opt, value, path):