simplification

tiramisu/option/baseoption.py

@@ -117,6 +117,8 @@ class Base(StorageBase):
             _multi = 1
         elif multi is submulti:
             _multi = submulti
+        else:
+            raise ValueError(_('invalid multi value'))
         if properties is None:
             properties = tuple()
         if not isinstance(properties, tuple):  # pragma: optional cover

tiramisu/option/masterslave.py

@@ -104,9 +104,9 @@ class MasterSlaves(object):
         else:  # pragma: no dynoptiondescription cover
             return opt == self.master or opt in self.slaves
 
-    def reset(self, opt, values):
+    def reset(self, opt, values, setting_properties):
         for slave in self.getslaves(opt):
-            values.reset(slave, validate=False)
+            values.reset(slave, validate=False, _setting_properties=setting_properties)
 
     def pop(self, opt, values, index):
         for slave in self.getslaves(opt):