remove oui/non yes/no ... types

src/rougail/annotator/constrainte.py

@@ -44,15 +44,15 @@ class ConstrainteAnnotator:
                  objectspace,
                  eosfunc_file,
                  ):
-        if not hasattr(objectspace.space, 'constraints'):
-            return
         self.objectspace = objectspace
         eosfunc = SourceFileLoader('eosfunc', eosfunc_file).load_module()
         self.functions = dir(eosfunc)
         self.functions.extend(INTERNAL_FUNCTIONS)
         self.valid_enums = {}
-
+        if hasattr(objectspace.space, 'variables'):
-        self.convert_auto_freeze()
+            self.convert_auto_freeze()
+        if not hasattr(objectspace.space, 'constraints'):
+            return
         if hasattr(self.objectspace.space.constraints, 'check'):
             self.check_check()
             self.check_valid_enum()
@@ -73,15 +73,15 @@ class ConstrainteAnnotator:
         """convert auto_freeze
         only if FREEZE_AUTOFREEZE_VARIABLE == 'oui' this variable is frozen
         """
-        def _convert_auto_freeze(variable, namespace):
+        def _convert_auto_freeze(variable):
             if variable.auto_freeze:
-                if namespace != Config['variable_namespace']:
+                if variable.namespace != Config['variable_namespace']:
                     xmlfiles = self.objectspace.display_xmlfiles(variable.xmlfiles)
-                    msg = _(f'auto_freeze is not allowed in extra "{namespace}" in {xmlfiles}')
+                    msg = _(f'auto_freeze is not allowed in extra "{variable.namespace}" in {xmlfiles}')
                     raise DictConsistencyError(msg, 49)
                 new_condition = self.objectspace.condition(variable.xmlfiles)
                 new_condition.name = 'auto_frozen_if_not_in'
-                new_condition.namespace = namespace
+                new_condition.namespace = variable.namespace
                 new_condition.source = FREEZE_AUTOFREEZE_VARIABLE
                 new_param = self.objectspace.param(variable.xmlfiles)
                 new_param.text = 'oui'
@@ -90,25 +90,21 @@ class ConstrainteAnnotator:
                 new_target.type = 'variable'
                 new_target.name = variable.name
                 new_condition.target = [new_target]
+                if not hasattr(self.objectspace.space, 'constraints'):
+                    self.objectspace.space.constraints = self.objectspace.constraints(variable.xmlfiles)
                 if not hasattr(self.objectspace.space.constraints, 'condition'):
                     self.objectspace.space.constraints.condition = []
                 self.objectspace.space.constraints.condition.append(new_condition)
         for variables in self.objectspace.space.variables.values():
-            if not hasattr(variables, 'family'):
-                continue
             for family in variables.family.values():
                 if not hasattr(family, 'variable'):
                     continue
                 for variable in family.variable.values():
                     if isinstance(variable, self.objectspace.leadership):
                         for follower in variable.variable:
-                            _convert_auto_freeze(follower,
+                            _convert_auto_freeze(follower)
-                                                 variables.namespace,
-                                                 )
                     else:
-                        _convert_auto_freeze(variable,
+                        _convert_auto_freeze(variable)
-                                             variables.namespace,
-                                             )
 
     def check_check(self):
         """valid and manage <check>

src/rougail/annotator/property.py

@@ -54,13 +54,8 @@ class PropertyAnnotator:
                 if not isinstance(service, self.objectspace.family):
                     continue
                 self.convert_property(service)
-                if not hasattr(service, 'family'):
-                    continue
-                self.convert_property(service)
                 for family in service.family:
                     self.convert_property(family)
-                    if not hasattr(family, 'variable'):
-                        continue
                     for variable in family.variable:
                         self.convert_property(variable)
 
@@ -68,16 +63,11 @@ class PropertyAnnotator:
         """convert variables
         """
         for variables in self.objectspace.space.variables.values():
-            if not hasattr(variables, 'family'):
-                continue
             for family in variables.family.values():
                 self.convert_property(family)
-                if not hasattr(family, 'variable'):
-                    continue
                 for variable in family.variable.values():
-                    if isinstance(variable, self.objectspace.leadership):
+                    self.convert_property(variable)
-                        self.convert_property(variable)
+                    if not isinstance(variable, self.objectspace.leadership):
-                        for follower in variable.variable:
+                        continue
-                            self.convert_property(follower)
+                    for follower in variable.variable:
-                    else:
+                        self.convert_property(follower)
-                        self.convert_property(variable)

src/rougail/annotator/service.py

@@ -7,7 +7,7 @@ from ..error import DictConsistencyError
 # that shall not be present in the exported (flatened) XML
 ERASED_ATTRIBUTES = ('redefine', 'exists', 'fallback', 'optional', 'remove_check', 'namespace',
                      'remove_condition', 'path', 'instance_mode', 'index', 'is_in_leadership',
-                     'level', 'remove_fill', 'xmlfiles')
+                     'level', 'remove_fill', 'xmlfiles', 'type')
 
 
 KEY_TYPE = {'variable': 'symlink',

src/rougail/annotator/variable.py

@@ -37,11 +37,9 @@ CONVERT_OPTION = {'number': dict(opttype="IntOption", func=int),
                   }
 
 
-FORCE_CHOICE = {'oui/non': ['oui', 'non'],
+FORCE_CHOICE = {'schedule': ['none', 'daily', 'weekly', 'monthly'],
-                'on/off': ['on', 'off'],
+                'schedulemod': ['pre', 'post'],
-                'yes/no': ['yes', 'no'],
+                }
-                'schedule': ['none', 'daily', 'weekly', 'monthly'],
-                'schedulemod': ['pre', 'post']}
 
 
 RENAME_ATTIBUTES = {'description': 'doc'}
@@ -63,8 +61,6 @@ class VariableAnnotator:
                           variable,
                           variable_type: str,
                           ) -> None:
-        if not hasattr(variable, 'type'):
-            variable.type = 'string'
         if variable.type != 'symlink' and not hasattr(variable, 'description'):
             variable.description = variable.name
         if hasattr(variable, 'value'):
@@ -83,7 +79,6 @@ class VariableAnnotator:
         self._convert_valid_enum(namespace,
                                  variable,
                                  )
-        self._valid_type(variable)
 
     def _convert_valid_enum(self,
                             namespace,
@@ -111,20 +106,10 @@ class VariableAnnotator:
             self.objectspace.space.constraints.check.append(check)
             variable.type = 'string'
 
-    def _valid_type(self,
-                    variable
-                    ) -> None:
-        if variable.type not in CONVERT_OPTION:
-            xmlf = self.objectspace.display_xmlfiles(variable.xmlfiles)
-            msg = _(f'unvalid type "{variable.type}" for variable "{variable.name}" in {xmlf}')
-            raise DictConsistencyError(msg, 36)
-
     def convert_variable(self):
         """convert variable
         """
         for families in self.objectspace.space.variables.values():
-            if not hasattr(families, 'family'):
-                continue
             families.doc = families.name
             for family in families.family.values():
                 family.doc = family.name

src/rougail/data/rougail.dtd

@@ -90,7 +90,7 @@
 
 <!ELEMENT variable (value*)>
 <!ATTLIST variable name CDATA #REQUIRED>
-<!ATTLIST variable type CDATA #IMPLIED>
+<!ATTLIST variable type (number|float|string|password|mail|boolean|filename|date|unix_user|ip|local_ip|netmask|network|broadcast|netbios|domain|hostname|web_address|port|mac|cidr|network_cidr|schedule|schedulemod) "string">
 <!ATTLIST variable description CDATA #IMPLIED>
 <!ATTLIST variable help CDATA #IMPLIED>
 <!ATTLIST variable hidden (True|False) "False">

src/rougail/tiramisureflector.py

@@ -266,7 +266,6 @@ class Variable(Common):
                          )
         self.is_follower = is_follower
         convert_option = CONVERT_OPTION[elt.type]
-        del elt.type
         self.object_type = convert_option['opttype']
         self.attrib.update(convert_option.get('initkwargs', {}))
         if self.object_type != 'SymLinkOption':

tests/dictionaries/00load_autofreeze/00-base.xml

@@ -2,10 +2,10 @@
 <rougail>
     <variables>
         <family name="général">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_freeze="True">
+            <variable name="mode_conteneur_actif" type="string" description="No change" auto_freeze="True">
                 <value>non</value>
             </variable>
-            <variable name="module_instancie" type="oui/non" description="No change">
+            <variable name="module_instancie" type="string" description="No change">
                 <value>non</value>
             </variable>
         </family>

tests/dictionaries/00load_autofreeze/tiramisu/base.py

@@ -8,8 +8,8 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='module_instancie', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='module_instancie', doc='No change', multi=False, default='non')
-option_3 = ChoiceOption(properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
 option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/00load_autofreezeexpert/00-base.xml

@@ -2,10 +2,10 @@
 <rougail>
     <variables>
         <family name="général">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_freeze="True" mode="expert">
+            <variable name="mode_conteneur_actif" type="string" description="No change" auto_freeze="True" mode="expert">
                 <value>non</value>
             </variable>
-            <variable name="module_instancie" type="oui/non" description="No change">
+            <variable name="module_instancie" type="string" description="No change">
                 <value>non</value>
             </variable>
         </family>

tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py

@@ -8,8 +8,8 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='module_instancie', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='module_instancie', doc='No change', multi=False, default='non')
-option_3 = ChoiceOption(properties=frozenset({'auto_freeze', 'expert', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'auto_freeze', 'expert', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
 option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/00load_autosave/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="général">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_save="True">
+            <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True">
                 <value>non</value>
             </variable>
         </family>

tests/dictionaries/00load_autosave/tiramisu/base.py

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'basic', 'force_store_value', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'basic', 'force_store_value', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
 option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/00load_autosaveexpert/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="général">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_save="True" mode="expert">
+            <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True" mode="expert">
                 <value>non</value>
             </variable>
         </family>

tests/dictionaries/00load_autosaveexpert/tiramisu/base.py

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'expert', 'force_store_value', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'expert', 'force_store_value', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
 option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'expert'}), children=[option_3])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/00load_comment/00-base.xml

@@ -3,7 +3,7 @@
     <variables>
         <family name="général">
             <!-- this is a comment -->
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
+            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>

tests/dictionaries/00load_comment/tiramisu/base.py

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
 option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/00load_notype/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="général">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
+            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>
             <variable name="without_type">

tests/dictionaries/00load_notype/tiramisu/base.py

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
 option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='without_type', doc='without_type', multi=False, default='non')
 option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])

tests/dictionaries/00load_save/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="général">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
+            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>

tests/dictionaries/00load_save/tiramisu/base.py

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
 option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/00load_subfolder/99-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="général">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
+            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>

tests/dictionaries/00load_subfolder/subfolder/00-base.xml

@@ -3,7 +3,7 @@
 <rougail>
     <variables>
         <family name='général'>
-            <variable name='mode_conteneur_actif1' type='oui/non' description="No change" hidden="True">
+            <variable name='mode_conteneur_actif1' type='string' description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>

tests/dictionaries/00load_subfolder/tiramisu/base.py

@@ -8,8 +8,8 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
-option_4 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_4 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non')
 option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/01auto_autofreeze/00-base.xml

@@ -2,10 +2,10 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="module_instancie" type="oui/non" description="No change">
+            <variable name="module_instancie" type="string" description="No change">
                 <value>non</value>
             </variable>
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_freeze="True" hidden="True">
+            <variable name="mode_conteneur_actif" type="string" description="No change" auto_freeze="True" hidden="True">
                 <value>non</value>
             </variable>
         </family>

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

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

tests/dictionaries/01auto_base/00-base.xml

@@ -2,10 +2,10 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
+            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>
-            <variable name="mode_conteneur_actif1" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif1" type="string" description="No change">
                 <value>non</value>
             </variable>
         </family>

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

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

tests/dictionaries/01auto_withoutparam/00-base.xml

@@ -2,10 +2,10 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
+            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>
-            <variable name="mode_conteneur_actif1" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif1" type="string" description="No change">
                 <value>non</value>
             </variable>
         </family>

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

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

tests/dictionaries/01base_file_include/00-base.xml

@@ -9,7 +9,7 @@
 
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="Description">
+            <variable name="mode_conteneur_actif" type="string" description="Description">
                 <value>non</value>
             </variable>
         </family>

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

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Description', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Description', multi=False, default='non')
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_8 = StrOption(name='group', doc='group', multi=False, default='root')

tests/dictionaries/01base_file_patch/00-base.xml

@@ -9,7 +9,7 @@
 
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="Description">
+            <variable name="mode_conteneur_actif" type="string" description="Description">
                 <value>non</value>
             </variable>
         </family>

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

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Description', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Description', multi=False, default='non')
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_8 = StrOption(name='group', doc='group', multi=False, default='root')

tests/dictionaries/01base_file_utfchar/00-base.xml

@@ -9,7 +9,7 @@
 
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="Description">
+            <variable name="mode_conteneur_actif" type="string" description="Description">
                 <value>non</value>
             </variable>
         </family>

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

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Description', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Description', multi=False, default='non')
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_8 = StrOption(name='group', doc='group', multi=False, default='root')

tests/dictionaries/01base_multi/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="Redefine description" hidden="True" multi="True">
+            <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True" multi="True">
                 <value>non</value>
             </variable>
         </family>

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

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Redefine description', multi=True, default=['non'], default_multi='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Redefine description', multi=True, default=['non'], default_multi='non')
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/01base_var_name_same_family/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="general" type="oui/non" description="description">
+            <variable name="general" type="string" description="description">
                 <value>non</value>
             </variable>
         </family>

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

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='general', doc='description', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='general', doc='description', multi=False, default='non')
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/01fill_autofreeze/00-base.xml

@@ -2,13 +2,13 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_freeze="True">
+            <variable name="mode_conteneur_actif" type="string" description="No change" auto_freeze="True">
                 <value>non</value>
             </variable>
-            <variable name="mode_conteneur_actif1" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif1" type="string" description="No change">
                 <value>non</value>
             </variable>
-            <variable name="module_instancie" type="oui/non" description="No change">
+            <variable name="module_instancie" type="string" description="No change">
                 <value>non</value>
             </variable>
         </family>

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

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

tests/dictionaries/01fill_autosave/00-base.xml

@@ -2,10 +2,10 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_save="True">
+            <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True">
                 <value>non</value>
             </variable>
-            <variable name="mode_conteneur_actif1" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif1" type="string" description="No change">
                 <value>non</value>
             </variable>
         </family>

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

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

tests/dictionaries/01fill_base/00-base.xml

@@ -2,8 +2,8 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change"/>
+            <variable name="mode_conteneur_actif" type="string" description="No change"/>
-            <variable name="mode_conteneur_actif1" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif1" type="string" description="No change">
                 <value>non</value>
             </variable>
         </family>

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

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

tests/dictionaries/01fill_baseaccent/00-base.xml

@@ -2,10 +2,10 @@
 <rougail>
     <variables>
         <family name="Général">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
+            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>
-            <variable name="mode_conteneur_actif1" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif1" type="string" description="No change">
                 <value>non</value>
             </variable>
         </family>

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

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

tests/dictionaries/01fill_mandatory/00-base.xml

@@ -2,8 +2,8 @@
 <rougail>
     <variables>
         <family name="general" mode="basic">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" mandatory="True" mode="expert"/>
+            <variable name="mode_conteneur_actif" type="string" description="No change" mandatory="True" mode="expert"/>
-            <variable name="mode_conteneur_actif1" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif1" type="string" description="No change">
                 <value>non</value>
             </variable>
         </family>

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

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

tests/dictionaries/01fill_number/00-base.xml

@@ -3,7 +3,7 @@
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="number" description="No change" hidden="True"/>
-            <variable name="mode_conteneur_actif1" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif1" type="string" description="No change">
                 <value>non</value>
             </variable>
         </family>

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

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

tests/dictionaries/01fill_only_optional/00-base.xml

@@ -2,10 +2,10 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
+            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>
-            <variable name="mode_conteneur_actif1" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif1" type="string" description="No change">
                 <value>non</value>
             </variable>
         </family>

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

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

tests/dictionaries/01fill_optional/00-base.xml

@@ -2,10 +2,10 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
+            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>
-            <variable name="mode_conteneur_actif1" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif1" type="string" description="No change">
                 <value>non</value>
             </variable>
         </family>

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

@@ -8,8 +8,8 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non')
-option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4])
 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/00-base.xml

@@ -2,10 +2,10 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="module_instancie" type="oui/non" description="No change">
+            <variable name="module_instancie" type="string" description="No change">
                 <value>non</value>
             </variable>
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_freeze="True">
+            <variable name="mode_conteneur_actif" type="string" description="No change" auto_freeze="True">
                 <value>non</value>
             </variable>
         </family>

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

@@ -8,8 +8,8 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='module_instancie', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='module_instancie', doc='No change', multi=False, default='non')
-option_4 = ChoiceOption(properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'mandatory', 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)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})), values=('oui', 'non'))
+option_4 = StrOption(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)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3, option_4])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/01separator_base/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
+            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>

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

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
 option_3.impl_set_information("separator", "Établissement")
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])

tests/dictionaries/01separator_neverhidden/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
+            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>

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

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
 option_3.impl_set_information("separator", "Établissement")
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])

tests/dictionaries/02autosave_hidden_frozenifin/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="général">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
+            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>
             <variable name="autosavevar" type="string" description="autosave variable" auto_save="True"/>

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

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

tests/dictionaries/10autosave_hidden/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="général">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
+            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>
             <variable name="autosavevar" type="string" description="autosave variable" hidden="True" auto_save="True"/>

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

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

tests/dictionaries/10check_valid_differ/00-base.xml

@@ -2,10 +2,10 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif" type="string" description="No change">
                 <value>oui</value>
             </variable>
-            <variable name="mode_conteneur_actif1" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif1" type="string" description="No change">
                 <value>non</value>
             </variable>
         </family>

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

@@ -8,8 +8,8 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non')
-option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)], name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)], name='mode_conteneur_actif', doc='No change', multi=False, default='oui')
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4])
 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/00-base.xml

@@ -2,13 +2,13 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif" type="string" description="No change">
                 <value>oui</value>
             </variable>
-            <variable name="mode_conteneur_actif1" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif1" type="string" description="No change">
                 <value>non</value>
             </variable>
-            <variable name="mode_conteneur_actif2" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif2" type="string" description="No change">
                 <value>non</value>
             </variable>
             <variable name="mode_conteneur_actif3" type="string" description="No change">

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

@@ -8,9 +8,9 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui')
-option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non')
-option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_5 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non')
 option_6 = StrOption(properties=frozenset({'mandatory', 'normal'}), 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)], name='mode_conteneur_actif3', doc='No change', multi=False, default='oui')
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5, option_6])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])

tests/dictionaries/10check_valid_differ_removecheck/00-base.xml

@@ -2,13 +2,13 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif" type="string" description="No change">
                 <value>oui</value>
             </variable>
-            <variable name="mode_conteneur_actif1" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif1" type="string" description="No change">
                 <value>non</value>
             </variable>
-            <variable name="mode_conteneur_actif2" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif2" type="string" description="No change">
                 <value>non</value>
             </variable>
             <variable name="mode_conteneur_actif3" type="string" description="No change">

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

@@ -8,9 +8,9 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui')
-option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non')
-option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_5 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non')
 option_6 = StrOption(properties=frozenset({'mandatory', 'normal'}), 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)], name='mode_conteneur_actif3', doc='No change', multi=False, default='oui')
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5, option_6])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])

tests/dictionaries/10check_valid_in_network/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif" type="string" description="No change">
                 <value>oui</value>
             </variable>
             <variable name="adresse_ip_eth0" type="local_ip" description="Adresse IP de la carte" mandatory="True" mode="basic"/>

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

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui')
 option_4 = IPOption(private_only=True, warnings_only=True, properties=frozenset({'basic', 'mandatory'}), name='adresse_ip_eth0', doc='Adresse IP de la carte', multi=False)
 option_5 = NetmaskOption(properties=frozenset({'basic', 'mandatory'}), name='adresse_netmask_eth0', doc='Masque de sous réseau de la carte', multi=False)
 option_6 = IPOption(private_only=True, warnings_only=True, properties=frozenset({'basic', 'mandatory'}), 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)], name='adresse_ip', doc='IP', multi=False)

tests/dictionaries/10check_valid_in_network_cidr/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif" type="string" description="No change">
                 <value>oui</value>
             </variable>
             <variable name="adresse_ip_eth0" type="cidr" description="Adresse IP de la carte" mandatory="True" mode="basic"/>

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

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

tests/dictionaries/10check_valid_ipnetmask/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif" type="string" description="No change">
                 <value>oui</value>
             </variable>
             <variable name="adresse_ip_eth0" type="local_ip" description="Adresse IP de la carte" mandatory="True" mode="basic"/>

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

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

tests/dictionaries/10leadership_append/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif" type="string" description="No change">
                 <value>non</value>
             </variable>
         </family>

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

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_6 = StrOption(name='leader', doc='leader', multi=True)
 option_7 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))

tests/dictionaries/10leadership_auto/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif" type="string" description="No change">
                 <value>non</value>
             </variable>
             <variable name="leader" type="string" description="leader" multi="True"/>

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

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
 option_5 = StrOption(name='leader', doc='leader', multi=True)
 option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_7 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})))

tests/dictionaries/10leadership_autoleader/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif" type="string" description="No change">
                 <value>non</value>
             </variable>
             <variable name="leader" type="string" description="leader" multi="True"/>

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

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
 option_5 = StrOption(name='leader', doc='leader', multi=True)
 option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_7 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={})))

tests/dictionaries/10leadership_autoleader_expert/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif" type="string" description="No change">
                 <value>non</value>
             </variable>
         </family>

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

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3])
 option_6 = StrOption(name='leader', doc='leader', multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_7 = StrOption(properties=frozenset({'expert'}), name='follower1', doc='follower1', multi=True)

tests/dictionaries/10leadership_autosaveexpert/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif" type="string" description="No change">
                 <value>non</value>
             </variable>
             <variable name="leader" type="string" description="leader" multi="True"/>

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

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
 option_5 = StrOption(name='leader', doc='leader', multi=True)
 option_6 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_7 = StrOption(properties=frozenset({'expert'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})))

tests/dictionaries/10leadership_familyaccent/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="Général">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif" type="string" description="No change">
                 <value>non</value>
             </variable>
             <variable name="leader" type="string" description="leader" multi="True"/>

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

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
 option_5 = StrOption(name='leader', doc='leader', multi=True)
 option_6 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_7 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})))

tests/dictionaries/10leadership_leader_hidden/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif" type="string" description="No change">
                 <value>non</value>
             </variable>
         </family>

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

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3])
 option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen'}), name='leader', doc='leader', multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_7 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'}), name='follower1', doc='follower1', multi=True)

tests/dictionaries/10leadership_leader_hidden_if_in/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="general" mode="expert">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif" type="string" description="No change">
                 <value>non</value>
             </variable>
         </family>

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

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3])
 option_6 = StrOption(properties=frozenset({Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))}), name='leader', doc='leader', multi=True)
 option_7 = StrOption(properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))}), name='follower1', doc='follower1', multi=True)

tests/dictionaries/10leadership_leadermandatory/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif" type="string" description="No change">
                 <value>non</value>
             </variable>
             <variable name="leader" type="string" description="leader" multi="True" mandatory="True"/>

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

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
 option_5 = StrOption(properties=frozenset({'mandatory'}), name='leader', doc='leader', multi=True)
 option_6 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_7 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})))

tests/dictionaries/10leadership_mandatory/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change">
+            <variable name="mode_conteneur_actif" type="string" description="No change">
                 <value>non</value>
             </variable>
             <variable name="leader" type="string" description="leader" multi="True"/>

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

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
 option_5 = StrOption(name='leader', doc='leader', multi=True)
 option_6 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_7 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})))

tests/dictionaries/10leadership_mandatoryfollower/00-base.xml

@@ -2,7 +2,7 @@
 <rougail>
     <variables>
         <family name="général">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
+            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>oui</value>
             </variable>
 			<variable name="nut_monitor_netmask" type="netmask" description="Masque de l'IP du réseau de l'esclave" multi="True"/>

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

@@ -8,7 +8,7 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non'))
+option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui')
 option_5 = NetmaskOption(name='nut_monitor_netmask', doc='Masque de l\'IP du réseau de l\'esclave', multi=True)
 option_6 = NetworkOption(properties=frozenset({'mandatory', 'normal'}), name='nut_monitor_host', doc='Adresse IP du réseau de l\'esclave', multi=True)
 option_4 = Leadership(name='nut_monitor_netmask', doc='Masque de l\'IP du réseau de l\'esclave', properties=frozenset({'normal'}), children=[option_5, option_6])