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

Merge remote-tracking branch 'origin/2.1'

Browse Source
This commit is contained in:
Emmanuel Garette
2017-06-16 18:25:31 +02:00
parent a2dc793be6 6de528d1f1
commit 6f030d426b
3 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tiramisu/option/masterslave.py
View File

@ -235,22 +235,20 @@ class MasterSlaves(object):
multi = value
return multi
def validate(self, values, opt, value, path, session):
def validate(self, values, opt, index, path, session, setitem):
if self.is_master(opt):
masterlen = len(value)
#for regen slave path
base_path = '.'.join(path.split('.')[:-1]) + '.'
for slave in self.getslaves(opt):
slave_path = base_path + slave.impl_getname()
slavelen = values._p_.get_max_length(slave_path, session)
self.validate_slave_length(masterlen, slavelen, slave.impl_getname(), opt)
self.validate_slave_length(index, slavelen, slave.impl_getname(), opt)
else:
val_len = self.get_length(values, opt, session, slave_path=path)
if isinstance(val_len, Exception):
return val_len
self.validate_slave_length(val_len,
len(value),
opt.impl_getname(), opt, setitem=True)
self.validate_slave_length(val_len, index,
opt.impl_getname(), opt, setitem=setitem)
def get_length(self, values, opt, session, validate=True, slave_path=undefined,
slave_value=undefined, force_permissive=False, master=None,