Merge branch '2.0'

2016-10-12 20:50:12 +02:00
parent e6a949635f 071035854b
commit 1b87e1d9bb
3 changed files with 34 additions and 4 deletions
--- a/tiramisu/option/masterslave.py
+++ b/tiramisu/option/masterslave.py
@ -224,10 +224,13 @@ class MasterSlaves(object):
                        multi.append_properties_error(value)
                    else:
                        return value
-                else:
+                elif index is None:
                    multi.append(value, setitem=False, force=True, validate=validate,
                                 force_permissive=force_permissive)
                    one_has_value = True
+                else:
+                    multi = value
+                    one_has_value = True
            if not one_has_value:
                #raise last err
                if returns_raise: