remove empty kwargs

FIXME

@@ -1,4 +1,2 @@
 default avec quote
 values avec quote
-
-supprimer kwargs dans "Params((ParamSelfOption()), kwargs={})"

src/rougail/tiramisureflector.py

@@ -168,7 +168,7 @@ class Common:
 
     def _populate_attrib(self,
                          keys: dict,
-                         ) -> None:
+                         ) -> None:  # pragma: no cover
         raise NotImplementedError()
 
     @staticmethod
@@ -277,8 +277,10 @@ class Variable(Common):
                     args.append(str(value))
                 else:
                     kwargs.append(f"'{param.name}': " + value)
-        ret = f"Calculation(func.{function}, Params((" + ', '.join(args) + \
+        ret = f'Calculation(func.{function}, Params((' + ', '.join(args) + ')'
-                "), kwargs=" + "{" + ', '.join(kwargs) + "})"
+        if kwargs:
+            ret += ', kwargs={' + ', '.join(kwargs) + '}'
+        ret += ')'
         if hasattr(child, 'warnings_only'):
             ret += f', warnings_only={child.warnings_only}'
         return ret + ')'

tests/dictionaries/01auto_autofreeze/tiramisu/base.py

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(name='module_instancie', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
-option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})), properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'frozen', 'hidden', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}))
+option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'frozen', 'hidden', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'basic'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/01auto_base/tiramisu/base.py

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
 option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
-option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
+option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)))), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/01auto_withoutparam/tiramisu/base.py

@@ -12,7 +12,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
+option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params(())), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
 option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])

tests/dictionaries/01fill_autofreeze/tiramisu/base.py

@@ -14,7 +14,7 @@ except:
 from rougail.tiramisu import ConvertDynOptionDescription
 option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
 option_5 = StrOption(name='module_instancie', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
-option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'auto_freeze', 'basic', 'force_store_value', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}))
+option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)))), properties=frozenset({'auto_freeze', 'basic', 'force_store_value', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'basic'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/01fill_autosave/tiramisu/base.py

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
 option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
-option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'basic', 'force_store_value'}))
+option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)))), properties=frozenset({'basic', 'force_store_value'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'basic'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/01fill_base/tiramisu/base.py

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
 option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
-option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'}))
+option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/01fill_baseaccent/tiramisu/base.py

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
 option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
-option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
+option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)))), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
 option_2 = OptionDescription(name='general', doc='Général', children=[option_3, option_4], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/01fill_mandatory/tiramisu/base.py

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
 option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
-option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'expert', 'mandatory'}))
+option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)))), properties=frozenset({'expert', 'mandatory'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/01fill_number/tiramisu/base.py

@@ -12,7 +12,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = IntOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue(3)), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
+option_3 = IntOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue(3)))), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
 option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])

tests/dictionaries/01fill_only_optional/tiramisu/base.py

@@ -12,7 +12,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
+option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params(())), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
 option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])

tests/dictionaries/01fill_optional/tiramisu/base.py

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
 option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
-option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
+option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)))), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(name='module_instancie', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
-option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})), properties=frozenset({'auto_freeze', 'basic', 'force_store_value', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}))
+option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({'auto_freeze', 'basic', 'force_store_value', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'basic'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/base.py

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}))
-option_4 = StrOption(name='autosavevar', doc='autosave variable', default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})), properties=frozenset({'basic', 'force_store_value', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}))
+option_4 = StrOption(name='autosavevar', doc='autosave variable', default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({'basic', 'force_store_value', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}))
 option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'basic'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/10autosave_hidden/tiramisu/base.py

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}))
-option_4 = StrOption(name='autosavevar', doc='autosave variable', default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})), properties=frozenset({'basic', 'force_store_value', 'frozen', 'hidden'}))
+option_4 = StrOption(name='autosavevar', doc='autosave variable', default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({'basic', 'force_store_value', 'frozen', 'hidden'}))
 option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'basic'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/10check_no_param/tiramisu/base.py

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='b', properties=frozenset({'mandatory', 'normal'}))
-option_4 = IntOption(name='int', doc='No change', validators=[Calculation(func.valid_lower, Params((ParamSelfOption()), kwargs={}), warnings_only=False)], properties=frozenset({'normal'}))
+option_4 = IntOption(name='int', doc='No change', validators=[Calculation(func.valid_lower, Params((ParamSelfOption())), warnings_only=False)], properties=frozenset({'normal'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/10check_optional/tiramisu/base.py

@@ -14,7 +14,7 @@ except:
 from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='b', properties=frozenset({'mandatory', 'normal'}))
 option_5 = IntOption(name='int2', doc='No change', properties=frozenset({'normal'}))
-option_4 = IntOption(name='int', doc='No change', validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)], properties=frozenset({'normal'}))
+option_4 = IntOption(name='int', doc='No change', validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False))), warnings_only=False)], properties=frozenset({'normal'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/10check_valid_differ/tiramisu/base.py

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
 option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
-option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)], properties=frozenset({'mandatory', 'normal'}))
+option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False))), warnings_only=False)], properties=frozenset({'mandatory', 'normal'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/10check_valid_differ_add/tiramisu/base.py

@@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'}))
 option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
 option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
-option_6 = StrOption(name='mode_conteneur_actif3', doc='No change', default='oui', validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)], properties=frozenset({'mandatory', 'normal'}))
+option_6 = StrOption(name='mode_conteneur_actif3', doc='No change', default='oui', validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False))), warnings_only=False)], properties=frozenset({'mandatory', 'normal'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5, option_6], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py

@@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'}))
 option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
 option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
-option_6 = StrOption(name='mode_conteneur_actif3', doc='No change', default='oui', validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)], properties=frozenset({'mandatory', 'normal'}))
+option_6 = StrOption(name='mode_conteneur_actif3', doc='No change', default='oui', validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False))), warnings_only=False)], properties=frozenset({'mandatory', 'normal'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5, option_6], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/10check_valid_in_network/tiramisu/base.py

@@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'}))
 option_4 = IPOption(name='adresse_ip_eth0', doc='Adresse IP de la carte', private_only=True, warnings_only=True, properties=frozenset({'basic', 'mandatory'}))
 option_5 = NetmaskOption(name='adresse_netmask_eth0', doc='Masque de sous réseau de la carte', properties=frozenset({'basic', 'mandatory'}))
-option_6 = IPOption(name='adresse_ip', doc='IP', validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=True)], private_only=True, warnings_only=True, properties=frozenset({'basic', 'mandatory'}))
+option_6 = IPOption(name='adresse_ip', doc='IP', validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False), ParamOption(option_5, notraisepropertyerror=False, todict=False))), warnings_only=True)], private_only=True, warnings_only=True, properties=frozenset({'basic', 'mandatory'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5, option_6], properties=frozenset({'basic'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/10check_valid_in_network_cidr/tiramisu/base.py

@@ -14,7 +14,7 @@ except:
 from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'}))
 option_4 = IPOption(name='adresse_ip_eth0', doc='Adresse IP de la carte', cidr=True, properties=frozenset({'basic', 'mandatory'}))
-option_5 = IPOption(name='adresse_ip', doc='IP', validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=True)], private_only=True, warnings_only=True, properties=frozenset({'basic', 'mandatory'}))
+option_5 = IPOption(name='adresse_ip', doc='IP', validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False))), warnings_only=True)], private_only=True, warnings_only=True, properties=frozenset({'basic', 'mandatory'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'basic'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py

@@ -14,7 +14,7 @@ except:
 from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'}))
 option_4 = IPOption(name='adresse_ip_eth0', doc='Adresse IP de la carte', private_only=True, warnings_only=True, properties=frozenset({'basic', 'mandatory'}))
-option_5 = NetmaskOption(name='adresse_netmask_eth0', doc='Masque de sous réseau de la carte', validators=[Calculation(func.valid_ipnetmask, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=True)], properties=frozenset({'basic', 'mandatory'}))
+option_5 = NetmaskOption(name='adresse_netmask_eth0', doc='Masque de sous réseau de la carte', validators=[Calculation(func.valid_ipnetmask, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False))), warnings_only=True)], properties=frozenset({'basic', 'mandatory'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'basic'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/10fill_information/tiramisu/base.py

@@ -12,7 +12,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamInformation("test_information", None)), kwargs={})), properties=frozenset({'normal'}))
+option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamInformation("test_information", None)))), properties=frozenset({'normal'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/10leadership_append/tiramisu/base.py

@@ -16,7 +16,7 @@ option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non'
 option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'}))
 option_6 = StrOption(name='leader', doc='leader', multi=True)
 option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'}))
-option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'}))
+option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'}))
 option_9 = StrOption(name='follower3', doc='follower3', multi=True, properties=frozenset({'normal'}))
 option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8, option_9], properties=frozenset({'normal'}))
 option_4 = OptionDescription(name='general1', doc='general1', children=[option_5], properties=frozenset({'normal'}))

tests/dictionaries/10leadership_append_hidden/tiramisu/base.py

@@ -16,7 +16,7 @@ option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non'
 option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'}))
 option_6 = StrOption(name='leader', doc='leader', multi=True, properties=frozenset({'force_default_on_freeze', 'frozen'}))
 option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'}))
-option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'}))
+option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)))), properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'}))
 option_9 = StrOption(name='follower3', doc='follower3', multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'}))
 option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8, option_9], properties=frozenset({'hidden', 'normal'}))
 option_4 = OptionDescription(name='general1', doc='general1', children=[option_5], properties=frozenset({'normal'}))

tests/dictionaries/10leadership_append_name/tiramisu/base.py

@@ -16,7 +16,7 @@ option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non'
 option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'}))
 option_6 = StrOption(name='leader', doc='leader', multi=True)
 option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'}))
-option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'}))
+option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'}))
 option_9 = StrOption(name='follower3', doc='follower3', multi=True, properties=frozenset({'normal'}))
 option_5 = Leadership(name='leadership', doc='leadership', children=[option_6, option_7, option_8, option_9], properties=frozenset({'normal'}))
 option_4 = OptionDescription(name='general1', doc='general1', children=[option_5], properties=frozenset({'normal'}))

tests/dictionaries/10leadership_auto/tiramisu/base.py

@@ -15,8 +15,8 @@ from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
 option_5 = StrOption(name='leader', doc='leader', multi=True)
 option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
-option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
+option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)))), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
-option_8 = StrOption(name='follower3', doc='follower3', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
+option_8 = StrOption(name='follower3', doc='follower3', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5, notraisepropertyerror=False, todict=False)))), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
 option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7, option_8], properties=frozenset({'normal'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])

tests/dictionaries/10leadership_autoleader/tiramisu/base.py

@@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
 option_5 = StrOption(name='leader', doc='leader', multi=True)
 option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
-option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
+option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5, notraisepropertyerror=False, todict=False)))), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
 option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7], properties=frozenset({'normal'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])

tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py

@@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
 option_5 = StrOption(name='leader', doc='leader', multi=True)
 option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'}))
-option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'expert'}))
+option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)))), properties=frozenset({'expert'}))
 option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7], properties=frozenset({'normal'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])

tests/dictionaries/10leadership_familyaccent/tiramisu/base.py

@@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
 option_5 = StrOption(name='leader', doc='leader', multi=True)
 option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'}))
-option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'}))
+option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'}))
 option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7], properties=frozenset({'normal'}))
 option_2 = OptionDescription(name='general', doc='Général', children=[option_3, option_4], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])

tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py

@@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
 option_5 = StrOption(name='leader', doc='leader', multi=True, properties=frozenset({'mandatory'}))
 option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'}))
-option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'}))
+option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'}))
 option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7], properties=frozenset({'basic'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'basic'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])

tests/dictionaries/10leadership_mandatory/tiramisu/base.py

@@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
 option_5 = StrOption(name='leader', doc='leader', multi=True)
 option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'mandatory', 'normal'}))
-option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'}))
+option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'}))
 option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7], properties=frozenset({'normal'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])

tests/dictionaries/10leadership_multi/tiramisu/base.py

@@ -16,7 +16,7 @@ option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non'
 option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'}))
 option_6 = StrOption(name='leader', doc='leader', multi=True)
 option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'}))
-option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'}))
+option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'}))
 option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8], properties=frozenset({'normal'}))
 option_10 = StrOption(name='leader1', doc='leader', multi=True)
 option_11 = StrOption(name='follower11', doc='follower1', multi=True, properties=frozenset({'normal'}))

tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'}))
-option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("non")), kwargs={})), properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}))
+option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("non")))), properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}))
 option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])

tests/dictionaries/10load_leadership/tiramisu/base.py

@@ -16,7 +16,7 @@ option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non'
 option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'}))
 option_6 = StrOption(name='leader', doc='leader', multi=True)
 option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'}))
-option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'}))
+option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'}))
 option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8], properties=frozenset({'normal'}))
 option_4 = OptionDescription(name='general1', doc='general1', children=[option_5], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4])

tests/dictionaries/10load_leadership_description/tiramisu/base.py

@@ -16,7 +16,7 @@ option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non'
 option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'}))
 option_6 = StrOption(name='leader', doc='leader', multi=True)
 option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'}))
-option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'}))
+option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'}))
 option_5 = Leadership(name='leader', doc='other description', children=[option_6, option_7, option_8], properties=frozenset({'normal'}))
 option_4 = OptionDescription(name='general1', doc='general1', children=[option_5], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4])

tests/dictionaries/10load_leadership_name/tiramisu/base.py

@@ -16,7 +16,7 @@ option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non'
 option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'}))
 option_6 = StrOption(name='leader', doc='leader', multi=True)
 option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'}))
-option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'}))
+option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'}))
 option_5 = Leadership(name='other_name', doc='other_name', children=[option_6, option_7, option_8], properties=frozenset({'normal'}))
 option_4 = OptionDescription(name='general1', doc='general1', children=[option_5], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4])

tests/dictionaries/10load_leadership_submulti/tiramisu/base.py

@@ -16,7 +16,7 @@ option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non'
 option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'}))
 option_6 = StrOption(name='leader', doc='leader', multi=True)
 option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'}))
-option_8 = StrOption(name='follower2', doc='follower2', multi=submulti, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'}))
+option_8 = StrOption(name='follower2', doc='follower2', multi=submulti, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'}))
 option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8], properties=frozenset({'normal'}))
 option_4 = OptionDescription(name='general1', doc='general1', children=[option_5], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4])

tests/dictionaries/20family_dynamic_calc/tiramisu/base.py

@@ -16,7 +16,7 @@ option_3 = StrOption(name='varname', doc='No change', multi=True, default=['val1
 option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'}))
 option_5 = StrOption(name='vardyn', doc='No change', default='val', properties=frozenset({'mandatory', 'normal'}))
 option_4 = ConvertDynOptionDescription(name='dyn', doc='dyn', suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({'normal'}))
-option_7 = StrOption(name='newvar', doc='No change', default=Calculation(func.calc_val, Params((ParamDynOption(option_5, 'val1', option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'}))
+option_7 = StrOption(name='newvar', doc='No change', default=Calculation(func.calc_val, Params((ParamDynOption(option_5, 'val1', option_4, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'}))
 option_6 = OptionDescription(name='new', doc='new', children=[option_7], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4, option_6])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/base.py

@@ -14,7 +14,7 @@ except:
 from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(name='varname', doc='No change', multi=True, default=['val1', 'val2'], default_multi='val2', properties=frozenset({'mandatory', 'normal'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'}))
-option_5 = StrOption(name='vardyn', doc='No change', default=Calculation(func.calc_val, Params((ParamSuffix()), kwargs={})), properties=frozenset({'normal'}))
+option_5 = StrOption(name='vardyn', doc='No change', default=Calculation(func.calc_val, Params((ParamSuffix()))), properties=frozenset({'normal'}))
 option_4 = ConvertDynOptionDescription(name='dyn', doc='dyn', suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({'normal'}))
 option_7 = StrOption(name='newvar', doc='No change', properties=frozenset({'normal'}))
 option_6 = OptionDescription(name='new', doc='new', children=[option_7], properties=frozenset({'normal'}))

tests/dictionaries/20family_dynamic_number/tiramisu/base.py

@@ -16,7 +16,7 @@ option_3 = IntOption(name='varname', doc='No change', multi=True, default=[1, 2]
 option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'}))
 option_5 = StrOption(name='vardyn', doc='No change', default='val', properties=frozenset({'mandatory', 'normal'}))
 option_4 = ConvertDynOptionDescription(name='dyn', doc='dyn', suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({'normal'}))
-option_7 = StrOption(name='newvar', doc='No change', default=Calculation(func.calc_val, Params((ParamDynOption(option_5, '1', option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'}))
+option_7 = StrOption(name='newvar', doc='No change', default=Calculation(func.calc_val, Params((ParamDynOption(option_5, '1', option_4, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'}))
 option_6 = OptionDescription(name='new', doc='new', children=[option_7], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4, option_6])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py

@@ -12,7 +12,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("value")), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
+option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("value")))), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py

@@ -12,7 +12,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("value")), kwargs={})), properties=frozenset({'normal'}))
+option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("value")))), properties=frozenset({'normal'}))
 option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/40empty_param/tiramisu/base.py

@@ -12,7 +12,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = PortOption(name='toto1', doc='Port d\'écoute du proxy', default=Calculation(func.calc_multi_condition, Params((ParamValue("None")), kwargs={})), allow_private=True, properties=frozenset({'expert'}))
+option_3 = PortOption(name='toto1', doc='Port d\'écoute du proxy', default=Calculation(func.calc_multi_condition, Params((ParamValue("None")))), allow_private=True, properties=frozenset({'expert'}))
 option_4 = PortOption(name='toto2', doc='Port d\'écoute du proxy NTLM', default='3127', allow_private=True, properties=frozenset({'expert', 'mandatory'}))
 option_2 = OptionDescription(name='proxy_authentifie', doc='proxy authentifié', children=[option_3, option_4], properties=frozenset({'expert'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])

tests/dictionaries/60action_external/tiramisu/base.py

@@ -16,7 +16,7 @@ option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non'
 option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'}))
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_6 = IntOption(name='delay', doc='délai en minutes avant lancement', default=0, properties=frozenset({'mandatory', 'normal'}))
-option_7 = URLOption(name='calc_url', doc='domain', default=Calculation(func.calc_val, Params((ParamValue("http://localhost/")), kwargs={})), allow_ip=True, allow_without_dot=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
+option_7 = URLOption(name='calc_url', doc='domain', default=Calculation(func.calc_val, Params((ParamValue("http://localhost/")))), allow_ip=True, allow_without_dot=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}))
 option_5 = OptionDescription(name='test', doc='test', children=[option_6, option_7], properties=frozenset({'normal'}))
 option_4 = OptionDescription(name='extra', doc='extra', children=[option_5])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4])