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

add some optimisation

Browse Source
This commit is contained in:
Emmanuel Garette
2015-12-14 23:37:15 +01:00
parent 98200ecae5
commit 59f59b0b1b
4 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tiramisu/option/masterslave.py
View File

@ -118,26 +118,25 @@ class MasterSlaves(object):
pass
def getitem(self, values, opt, path, validate, force_permissive,
force_properties, validate_properties, slave_path=undefined,
trusted_cached_properties, validate_properties, slave_path=undefined,
slave_value=undefined, setting_properties=undefined,
self_properties=undefined, index=None):
if self.is_master(opt):
return self._getmaster(values, opt, path, validate,
force_permissive, force_properties,
force_permissive,
validate_properties, slave_path,
slave_value, self_properties, index)
else:
return self._getslave(values, opt, path, validate,
force_permissive, force_properties,
force_permissive, trusted_cached_properties,
validate_properties, setting_properties,
self_properties, index)
def _getmaster(self, values, opt, path, validate, force_permissive,
force_properties, validate_properties, c_slave_path,
validate_properties, c_slave_path,
c_slave_value, self_properties, index):
value = values._get_validated_value(opt, path, validate,
force_permissive,
force_properties,
validate_properties,
self_properties=self_properties,
index=index)
@ -153,7 +152,7 @@ class MasterSlaves(object):
return value
def _getslave(self, values, opt, path, validate, force_permissive,
force_properties, validate_properties, setting_properties,
trusted_cached_properties, validate_properties, setting_properties,
self_properties, index):
"""
if master has length 0:
@ -191,7 +190,6 @@ class MasterSlaves(object):
value=multi,
path=path,
force_permissive=force_permissive,
force_properties=force_properties,
setting_properties=setting_properties)
else:
one_has_value = False
@ -202,7 +200,8 @@ class MasterSlaves(object):
for idx in indexes:
try:
value = values._get_cached_value(opt, path, validate,
force_permissive, force_properties,
force_permissive,
trusted_cached_properties,
validate_properties,
with_meta=master_is_meta,
index=idx,