src/rougail/annotator/check.py

@@ -52,7 +52,6 @@ class CheckAnnotator(TargetAnnotator, ParamAnnotator):
         self.functions.extend(INTERNAL_FUNCTIONS)
         self.functions.extend(self.objectspace.rougailconfig['internal_functions'])
         self.target_is_uniq = False
-        self.allow_function = True
         self.convert_target(self.objectspace.space.constraints.check)
         self.convert_param(self.objectspace.space.constraints.check)
         self.check_check()
@@ -133,23 +132,11 @@ class CheckAnnotator(TargetAnnotator, ParamAnnotator):
         has_variable = False
         values = []
         has_nil = False
-        is_function = False
         for param in check.param:
             if has_variable:
                 msg = _(f'only one "variable" parameter is allowed for valid_enum '
                         f'of variable "{variable.name}"')
                 raise DictConsistencyError(msg, 5, param.xmlfiles)
-            if param.type == 'function':
-                is_function = True
-                choice = self.objectspace.choice(variable.xmlfiles)
-                choice.name = param.text
-                choice.type = 'function'
-                choice.param = []
-                variable.values.append(choice)
-                continue
-            if is_function:
-                variable.values[0].param.append(param)
-                continue
             param_type = variable.ori_type
             if param.type == 'variable':
                 has_variable = True
@@ -161,7 +148,7 @@ class CheckAnnotator(TargetAnnotator, ParamAnnotator):
                     msg = _(f'only multi "variable" parameter is allowed for valid_enum '
                             f'of variable "{variable.name}"')
                     raise DictConsistencyError(msg, 6, param.xmlfiles)
-                param_type = 'variable'
+                param_type = 'calculation'
             elif param.type == 'nil':
                 has_nil = True
             values.append(param.text)
@@ -169,8 +156,6 @@ class CheckAnnotator(TargetAnnotator, ParamAnnotator):
             choice.name = param.text
             choice.type = param_type
             variable.values.append(choice)
-        if is_function:
-            return None
         if 'mandatory' not in vars(variable):
             variable.mandatory = not has_nil
         elif variable.mandatory is False:

src/rougail/annotator/condition.py

@@ -50,7 +50,6 @@ class ConditionAnnotator(TargetAnnotator, ParamAnnotator, Walk):
             return
         self.target_is_uniq = False
         self.only_variable = False
-        self.allow_function = False
         self.convert_target(self.objectspace.space.constraints.condition)
         self.check_condition_optional()
         self.convert_condition_source()
@@ -75,9 +74,9 @@ class ConditionAnnotator(TargetAnnotator, ParamAnnotator, Walk):
         for variable in self.get_variables():
             if not variable.auto_freeze and not variable.auto_save:
                 continue
-            #if variable.namespace != self.objectspace.rougailconfig['variable_namespace']:
+            if variable.namespace != self.objectspace.rougailconfig['variable_namespace']:
-            #    msg = _(f'auto_freeze is not allowed in extra "{variable.namespace}"')
+                msg = _(f'auto_freeze is not allowed in extra "{variable.namespace}"')
-            #    raise DictConsistencyError(msg, 49, variable.xmlfiles)
+                raise DictConsistencyError(msg, 49, variable.xmlfiles)
             variable.force_store_value = True
             if variable.auto_save:
                 continue
@@ -90,7 +89,7 @@ class ConditionAnnotator(TargetAnnotator, ParamAnnotator, Walk):
             new_condition.param = [new_param]
             new_target = self.objectspace.target(variable.xmlfiles)
             new_target.type = 'variable'
-            new_target.name = variable.path
+            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)

src/rougail/annotator/family.py

@@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 from ..i18n import _
 from ..error import DictConsistencyError
+from ..utils import normalize_family
 from .variable import Walk
 
 
@@ -90,6 +91,7 @@ class FamilyAnnotator(Walk):
                 family.description = family.name
             family.doc = family.description
             del family.description
+            family.name = normalize_family(family.name)
 
     def change_modes(self):
         """change the mode of variables

src/rougail/annotator/fill.py

@@ -32,9 +32,6 @@ from .target import TargetAnnotator
 from .param import ParamAnnotator
 
 
-CALC_MULTI = ('calc_value', 'calc_list', 'get_range', 'calc_val_first_value', 'unbound_filename')
-
-
 class FillAnnotator(TargetAnnotator, ParamAnnotator):
     """Fill annotator
     """
@@ -47,23 +44,13 @@ class FillAnnotator(TargetAnnotator, ParamAnnotator):
                 not hasattr(self.objectspace.space.constraints, 'fill'):
             return
         self.functions = dir(load_modules(eosfunc_file))
-        self.functions.extend(self.objectspace.rougailconfig['internal_functions'])
         self.target_is_uniq = True
         self.only_variable = True
-        self.allow_function = False
         self.convert_target(self.objectspace.space.constraints.fill)
         self.convert_param(self.objectspace.space.constraints.fill)
         self.fill_to_value()
         del self.objectspace.space.constraints.fill
 
-    def calc_is_multi(self, variable: 'self.objectspace.variable') -> bool:
-        multi = variable.multi
-        if multi is False:
-            return multi
-        if multi == 'submulti':
-            return True
-        return not self.objectspace.paths.is_follower(variable.path)
-
     def fill_to_value(self) -> None:
         """valid and manage <fill>
         """
@@ -78,11 +65,6 @@ class FillAnnotator(TargetAnnotator, ParamAnnotator):
                 value = self.objectspace.value(fill.xmlfiles)
                 value.type = 'calculation'
                 value.name = fill.name
-                if fill.name not in CALC_MULTI:
-                    is_calc_multi = self.calc_is_multi(target.name)
-                else:
-                    is_calc_multi = False
-                value.calc_multi = is_calc_multi
                 if target.name.namespace == 'services':
                     target.name.default = value
                 else:

src/rougail/annotator/param.py

@@ -24,9 +24,6 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-try:
-    import tiramisu3 as tiramisu
-except ModuleNotFoundError:
 import tiramisu
 
 from .variable import CONVERT_OPTION
@@ -85,16 +82,6 @@ class ParamAnnotator:
                             if err.errno != 42 or not param.optional:
                                 raise err
                             param_to_delete.append(param_idx)
-                    elif param.type == 'function':
-                        if not self.allow_function:
-                            msg = _(f'cannot use "function" type')
-                            raise DictConsistencyError(msg, 74, param.xmlfiles)
-                        if not param.text in self.functions:
-                            msg = _(f'cannot find function "{param.text}"')
-                            raise DictConsistencyError(msg, 67, param.xmlfiles)
-                        if param_idx != 0:
-                            msg = _(f'function "{param.text}" must only set has first parameter')
-                            raise DictConsistencyError(msg, 75, param.xmlfiles)
                     elif variable_type:
                         self._convert_with_variable_type(variable_type, param)
                     continue

src/rougail/annotator/variable.py

@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 from ..i18n import _
 from ..error import DictConsistencyError
 from ..objspace import convert_boolean
+from ..utils import normalize_family
 
 
 CONVERT_OPTION = {'number': dict(opttype="IntOption", func=int),
@@ -49,7 +50,7 @@ CONVERT_OPTION = {'number': dict(opttype="IntOption", func=int),
                   'broadcast': dict(opttype="BroadcastOption"),
                   'netbios': dict(opttype="DomainnameOption", initkwargs={'type': 'netbios',
                                   'warnings_only': True}),
-                  'domainname': dict(opttype="DomainnameOption", initkwargs={'type': 'domainname',
+                  'domain': dict(opttype="DomainnameOption", initkwargs={'type': 'domainname',
                                  'allow_ip': False}),
                   'hostname': dict(opttype="DomainnameOption", initkwargs={'type': 'hostname',
                                    'allow_ip': False}),
@@ -170,6 +171,7 @@ class VariableAnnotator(Walk):  # pylint: disable=R0903
             if not variable.value:
                 del variable.value
         variable.doc = variable.description
+        variable.name = normalize_family(variable.name)
         del variable.description
         if variable_type == 'follower':
             if variable.multi is True:

src/rougail/data/rougail.dtd

@@ -86,7 +86,7 @@
 
 <!ELEMENT variable (value*)>
 <!ATTLIST variable name CDATA #REQUIRED>
-<!ATTLIST variable type (number|float|string|password|mail|boolean|filename|date|unix_user|ip|local_ip|netmask|network|broadcast|netbios|domainname|hostname|web_address|port|mac|cidr|network_cidr|schedule|schedulemod) "string">
+<!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">
@@ -121,7 +121,7 @@
 <!ATTLIST condition apply_on_fallback (True|False) #IMPLIED>
 
 <!ELEMENT param (#PCDATA)>
-<!ATTLIST param type (string|number|nil|boolean|variable|function|information|target_information|suffix|index) "string">
+<!ATTLIST param type (string|number|nil|boolean|variable|information|target_information|suffix|index) "string">
 <!ATTLIST param name CDATA #IMPLIED>
 <!ATTLIST param propertyerror (True|False) "True">
 <!ATTLIST param optional (True|False) "False">

src/rougail/objspace.py

@@ -29,7 +29,7 @@ from typing import Optional
 
 from .i18n import _
 from .xmlreflector import XMLReflector
-from .utils import valid_variable_family_name
+from .utils import normalize_family
 from .error import SpaceObjShallNotBeUpdated, DictConsistencyError
 from .path import Path
 
@@ -197,7 +197,7 @@ class RougailObjSpace:
             if child.tag == 'family':
                 if child.attrib['name'] in family_names:
                     msg = _(f'Family "{child.attrib["name"]}" is set several times')
-                    raise DictConsistencyError(msg, 44, [xmlfile])
+                    raise DictConsistencyError(msg, 44, xmlfile)
                 family_names.append(child.attrib['name'])
             try:
                 # variable objects creation
@@ -296,7 +296,6 @@ class RougailObjSpace:
         """A redefinable object could be created or updated
         """
         existed_var = self.get_existed_obj(name,
-                                           xmlfile,
                                            space,
                                            child,
                                            namespace,
@@ -338,7 +337,6 @@ class RougailObjSpace:
 
     def get_existed_obj(self,
                         name: str,
-                        xmlfile: str,
                         space: str,
                         child,
                         namespace: str,
@@ -346,7 +344,7 @@ class RougailObjSpace:
         """if an object exists, return it
         """
         if child.tag in ['variable', 'family']:
-            valid_variable_family_name(name, [xmlfile])
+            name = normalize_family(name)
         if child.tag == 'variable':  # pylint: disable=E1101
             if namespace != self.rougailconfig['variable_namespace']:
                 name = space.path + '.' + name
@@ -470,18 +468,18 @@ class RougailObjSpace:
         """
         if isinstance(variableobj, self.variable):  # pylint: disable=E1101
             if 'name' in document.attrib:
-                family_name = document.attrib['name']
+                family_name = normalize_family(document.attrib['name'])
             else:
                 family_name = namespace
 
             self.paths.add_variable(namespace,
-                                    variableobj.name,
+                                    normalize_family(variableobj.name),
                                     space.path,
                                     document.attrib.get('dynamic') is not None,
                                     variableobj,
                                     )
         elif isinstance(variableobj, self.family):  # pylint: disable=E1101
-            family_name = variableobj.name
+            family_name = normalize_family(variableobj.name)
             if namespace != self.rougailconfig['variable_namespace']:
                 family_name = namespace + '.' + family_name
             self.paths.add_family(namespace,
@@ -504,6 +502,8 @@ class RougailObjSpace:
         if isinstance(variableobj, Redefinable):
             name = variableobj.name
             tag = FORCE_TAG.get(child.tag, child.tag)
+            if child.tag in ['family', 'variable']:
+                name = normalize_family(name)
             getattr(space, tag)[name] = variableobj
         elif isinstance(variableobj, UnRedefinable):
             getattr(space, child.tag).append(variableobj)

src/rougail/template/base.py

@@ -166,14 +166,11 @@ class RougailExtra:
         try:
             return self.suboption[key]
         except KeyError:
-            raise AttributeError(f'unable to find extra "{key}"')
+            raise AttributeError
 
     def __iter__(self):
         return iter(self.suboption.values())
 
-    def items(self):
-        return self.suboption.items()
-
 
 class RougailBaseTemplate:
     """Engine to process Creole cheetah template
@@ -234,7 +231,7 @@ class RougailBaseTemplate:
 
     def instance_file(self,
                       filevar: Dict,
-                      type_: str,
+                      type: str,
                       service_name: str,
                       ) -> None:
         """Run templatisation on one file
@@ -256,7 +253,7 @@ class RougailBaseTemplate:
                 var = variable[idx]
             else:
                 var = None
-            func = f'_instance_{type_}'
+            func = f'_instance_{type}'
             data = getattr(self, func)(filevar,
                                        filename,
                                        service_name,

src/rougail/template/engine/creole_legacy.py

@@ -74,27 +74,6 @@ class IsDefined:
             return varname in self.context
 
 
-class CreoleClient():
-    def get(self, path):
-        path = path.replace('/', '.')
-        if path.startswith('.'):
-            path = path[1:]
-        if '.' not in path:
-            return self.context[path]
-        else:
-            root, path = path.split('.', 1)
-            obj = self.context[root]
-            for var in path.split('.'):
-                obj = getattr(obj, var)
-            return obj
-
-
-def is_empty(data):
-    if str(data) in ['', '""', "''", "[]", "['']", '[""]', "None"]:
-        return True
-    return False
-
-
 class CheetahTemplate(oriCheetahTemplate):
     def __init__(self,
                  filename: str,
@@ -103,12 +82,7 @@ class CheetahTemplate(oriCheetahTemplate):
                  eosfunc: Dict,
                  extra_context: Dict,
                  ):
-        creole_client = CreoleClient()
-        creole_client.context=context
         extra_context['is_defined'] = IsDefined(context)
-        extra_context['creole_client'] = creole_client
-        extra_context['is_empty'] = is_empty
-        extra_context['_creole_filename'] = extra_context['rougail_filename']
         super().__init__(filename, source, context, eosfunc, extra_context)
 
 

src/rougail/template/systemd.py

@@ -58,8 +58,7 @@ z %%filename - - - - -
       %end if
     %end for
   %end if
-%end for
+%end for"""
-"""
 
 
 class RougailSystemdTemplate(RougailBaseTemplate):

src/rougail/tiramisureflector.py

@@ -296,11 +296,9 @@ class Variable(Common):
             keys['opt'] = self.elt.opt.reflector_object.get()
         if hasattr(self.elt, 'values'):
             values = self.elt.values
-            if values[0].type == 'variable':
+            if values[0].type == 'calculation':
                 value = values[0].name.reflector_object.get()
                 keys['values'] = f"Calculation(func.calc_value, Params((ParamOption({value}))))"
-            elif values[0].type == 'function':
-                keys['values'] = self.calculation_value(self.elt.values[0], [])
             else:
                 keys['values'] = str(tuple([val.name for val in values]))
         if hasattr(self.elt, 'multi') and self.elt.multi:
@@ -311,11 +309,11 @@ class Variable(Common):
                 if isinstance(value, str):
                     value = self.convert_str(value)
                 elif isinstance(value, self.objectspace.value):
-                    value = self.calculation_value(value, [], calc_multi=value.calc_multi)
+                    value = self.calculation_value(value, [])
                 keys[key] = value
         if hasattr(self.elt, 'validators'):
             keys['validators'] = '[' + ', '.join([self.calculation_value(val,
-                                    ['ParamSelfOption(whole=False)']) for val in self.elt.validators]) + ']'
+                                    ['ParamSelfOption()']) for val in self.elt.validators]) + ']'
         for key in ['min_number', 'max_number']:
             if hasattr(self.elt, key):
                 keys[key] = getattr(self.elt, key)
@@ -327,7 +325,6 @@ class Variable(Common):
     def calculation_value(self,
                           child,
                           args,
-                          calc_multi=False,
                           ) -> str:
         """Generate calculated value
         """
@@ -339,9 +336,11 @@ class Variable(Common):
             for param in child.param:
                 value = self.populate_param(param)
                 if not hasattr(param, 'name'):
+#                    args.append(str(value))
                     new_args.append(str(value))
                 else:
                     kwargs.append(f"'{param.name}': " + value)
+#        ret = f'Calculation(func.{function}, Params((' + ', '.join(args) + ')'
         if function == 'valid_network_netmask':
             new_args.extend(args)
         else:
@@ -353,10 +352,7 @@ class Variable(Common):
         ret += ')'
         if hasattr(child, 'warnings_only'):
             ret += f', warnings_only={child.warnings_only}'
-        ret = ret + ')'
+        return ret + ')'
-        if calc_multi:
-            ret = '[' + ret + ']'
-        return ret
 
 
 class Family(Common):
@@ -387,5 +383,5 @@ class Family(Common):
                          ) -> None:
         if hasattr(self.elt, 'suffixes'):
             dyn = self.elt.suffixes.reflector_object.get()
-            keys['suffixes'] = f"Calculation(func.calc_value, Params((ParamOption({dyn}, notraisepropertyerror=True))))"
+            keys['suffixes'] = f"Calculation(func.calc_value, Params((ParamOption({dyn}))))"
         keys['children'] = '[' + ', '.join([child.get() for child in self.children]) + ']'

src/rougail/update.py

@@ -25,13 +25,10 @@ from os.path import join, isfile, basename
 from os import listdir
 from lxml.etree import DTD, parse, XMLParser, XMLSyntaxError  # pylint: disable=E0611
 from lxml.etree import Element, SubElement, tostring
-from ast import parse as ast_parse
 
 from .i18n import _
 from .error import UpgradeError
 
-from .utils import normalize_family
-
 
 VERSIONS = {'creole': ['1'],
             'rougail': ['0.9'],
@@ -43,7 +40,7 @@ def get_function_name(root, version):
     return f'update_{root}_{version}'
 
 
-FUNCTION_VERSIONS = [(root, version, get_function_name(root, version)) for root, versions in VERSIONS.items() for version in versions]
+FUNCTION_VERSIONS = [get_function_name(root, version) for root, versions in VERSIONS.items() for version in versions]
 
 
 class RougailUpgrade:
@@ -56,7 +53,6 @@ class RougailUpgrade:
     def load_xml_from_folders(self,
                               srcfolder: str,
                               dstfolder: str,
-                              namespace: str,
                               ):
         """Loads all the XML files located in the xmlfolders' list
 
@@ -75,13 +71,10 @@ class RougailUpgrade:
             root = document.getroot()
             search_function_name = get_function_name(root.tag, root.attrib.get('version', '1'))
             function_found = False
-            for root_name, version, function_version in FUNCTION_VERSIONS:
+            for function_version in FUNCTION_VERSIONS:
                 if function_found and hasattr(self, function_version):
-                    print(f'  - convert {filename} to version {version}')
                     upgrade_help = self.upgrade_help.get(function_version, {}).get(filename, {})
-                    if upgrade_help.get('remove') is True:
+                    root = getattr(self, function_version)(root, upgrade_help)
-                        continue
-                    root = getattr(self, function_version)(root, upgrade_help, namespace)
                 if function_version == search_function_name:
                     function_found = True
             with open(xmldst, 'wb') as xmlfh:
@@ -97,7 +90,6 @@ class RougailUpgrade:
     def update_rougail_0_9(self,
                            root: 'Element',
                            upgrade_help: dict,
-                           namespace: str,
                            ) -> 'Element':
         # rename root
         root.tag = 'rougail'
@@ -119,9 +111,6 @@ class RougailUpgrade:
             if not isinstance(subelement.tag, str):
                 # XML comment
                 continue
-            if subelement.tag == 'family_action':
-                root.remove(subelement)
-                continue
             for subsubelement in subelement:
                 if not isinstance(subsubelement.tag, str):
                     # XML comment
@@ -141,27 +130,16 @@ class RougailUpgrade:
                         if subsubsubelement.attrib['name'] in upgrade_help.get('variables', {}).get('hidden', {}).get('remove', []):
                             self.remove(subsubsubelement, 'hidden', optional=True)
                         if subsubsubelement.attrib['name'] in upgrade_help.get('variables', {}).get('mandatory', {}).get('remove', []):
-                            self.remove(subsubsubelement, 'mandatory')
+                            self.remove(subsubsubelement, 'mandatory', optional=True)
-                        if subsubsubelement.attrib['name'] in upgrade_help.get('variables', {}).get('mandatory', {}).get('add', []):
+                        variables[subsubsubelement.attrib['name']] = subsubsubelement
-                            subsubsubelement.attrib['mandatory'] = 'True'
-                        if subsubsubelement.attrib['name'] in upgrade_help.get('variables', {}).get('type', {}):
-                            subsubsubelement.attrib['type'] = upgrade_help.get('variables', {}).get('type', {})[subsubsubelement.attrib['name']]
-                        if namespace == 'configuration':
-                            path = subsubsubelement.attrib['name']
-                            npath = normalize_family(subsubsubelement.attrib['name'])
-                        else:
-                            path = namespace + '.' + subsubelement.attrib['name'] + '.' + subsubsubelement.attrib['name']
-                            npath = normalize_family(namespace) + '.' + normalize_family(subsubelement.attrib['name']) + '.' + normalize_family(subsubsubelement.attrib['name'])
-                        variables[path] = subsubsubelement
-                        variables[npath] = subsubsubelement
                         type = subsubsubelement.attrib.get('type')
                         if type in ['oui/non', 'yes/no', 'on/off']:
-                            variables_auto_valid_enum.setdefault(subsubsubelement.attrib['type'], []).append(path)
+                            variables_auto_valid_enum.setdefault(subsubsubelement.attrib['type'], []).append(subsubsubelement.attrib['name'])
                             del subsubsubelement.attrib['type']
                         elif type == 'hostname_strict':
                             subsubsubelement.attrib['type'] = 'hostname'
-                        elif type in ['domain', 'domain_strict']:
+                        elif type == 'domain_strict':
-                            subsubsubelement.attrib['type'] = 'domainname'
+                            subsubsubelement.attrib['type'] = 'domain'
                         elif type == 'string':
                             del subsubsubelement.attrib['type']
                         if self.test and subsubsubelement.attrib.get('auto_freeze') == 'True':
@@ -175,36 +153,17 @@ class RougailUpgrade:
                             subsubsubelement.attrib['remove_check'] = 'True'
                         if subsubsubelement.attrib['name'] in upgrade_help.get('variables', {}).get('mode', {}).get('modify', {}):
                             subsubsubelement.attrib['mode'] = upgrade_help.get('variables', {}).get('mode', {}).get('modify', {})[subsubsubelement.attrib['name']]
-                        if subsubsubelement.attrib['name'] in upgrade_help.get('variables', {}).get('type', {}).get('modify', {}):
-                            subsubsubelement.attrib['type'] = upgrade_help.get('variables', {}).get('type', {}).get('modify', {})[subsubsubelement.attrib['name']]
-                            type = subsubsubelement.attrib['type']
                         if subsubsubelement.attrib['name'] in upgrade_help.get('variables', {}).get('test', {}):
                             subsubsubelement.attrib['test'] = upgrade_help.get('variables', {}).get('test', {})[subsubsubelement.attrib['name']]
-                        if subsubsubelement.attrib['name'] in upgrade_help.get('variables', {}).get('remove_value', []):
+#                        for value in subsubsubelement:
-                            for value in subsubsubelement:
+#                            if value.text is None:
-                                subsubsubelement.remove(value)
+#                                value.attrib['type'] = 'nil'
-                        if subsubsubelement.attrib['name'] != normalize_family(subsubsubelement.attrib['name']):
-                            if "description" not in subsubsubelement.attrib:
-                                subsubsubelement.attrib['description'] = subsubsubelement.attrib['name']
-                            subsubsubelement.attrib['name'] = normalize_family(subsubsubelement.attrib['name'])
                     elif subsubsubelement.tag == 'param':
-                        if subsubelement.tag == 'check' and subsubelement.attrib['target'] in upgrade_help.get('check', {}).get('remove', []):
-                            continue
                         type = subsubsubelement.attrib.get('type')
                         if type == 'eole':
                             subsubsubelement.attrib['type'] = 'variable'
                             type = 'variable'
-                        if type == 'python':
+                        elif type in ('container', 'context', 'python'):
-                            subsubsubelement.attrib['type'] = 'function'
-                            if subsubsubelement.text.startswith('range('):
-                                func_ast = ast_parse(subsubsubelement.text)
-                                subsubsubelement.text = 'range'
-                                for arg in func_ast.body[0].value.args:
-                                    SubElement(subsubelement, 'param', type='number').text = str(arg.value)
-                            else:
-                                raise Exception(f'{subsubsubelement.text} is not a supported function')
-                            type = 'function'
-                        elif type in ('container', 'context'):
                             raise UpgradeError(_(f'cannot convert param with type "{type}"'))
                         if subsubelement.attrib['name'] == 'valid_entier' and not 'type' in subsubsubelement.attrib:
                             subsubsubelement.attrib['type'] = 'number'
@@ -213,11 +172,7 @@ class RougailUpgrade:
                             continue
                         if subsubelement.attrib['name'] == 'valid_enum' and not type:
                             if subsubsubelement.attrib.get('name') == 'checkval':
-                                if subsubelement.attrib['target'] in upgrade_help.get('check', {}).get('valid_enums', {}).get('checkval', {}).get('remove', []):
-                                    subsubelement.remove(subsubsubelement)
-                                    continue
                                 raise UpgradeError(_('checkval in valid_enum is no more supported'))
-                            if subsubsubelement.text.startswith('['):
                             for val in eval(subsubsubelement.text):
                                 SubElement(subsubelement, 'param').text = str(val)
                             subsubelement.remove(subsubsubelement)
@@ -234,18 +189,16 @@ class RougailUpgrade:
                         type = subsubsubelement.attrib.get('type')
                         if type in ['service_accesslist', 'service_restrictionlist', 'interfacelist', 'hostlist']:
                             subsubelement.remove(subsubsubelement)
+#                        elif self.test and type in ['filelist', 'variable', 'servicelist']:
+#                            subsubsubelement.attrib['optional'] = "True"
                         elif (not type or type == 'variable') and subsubsubelement.text in upgrade_help.get('variables', {}).get('remove', []):
                             subsubelement.remove(subsubsubelement)
                         elif type == 'family' and subsubsubelement.text in upgrade_help.get('families', {}).get('remove', []):
                             subsubelement.remove(subsubsubelement)
-                        elif type == 'actionlist':
+                        up = upgrade_help.get('targets', {}).get(subsubsubelement.text)
-#                            for family in root.find('variables'):
+                        if up:
-#                                family_list = SubElement(subsubelement, 'target')
+                            if 'optional' in up:
-#                                family_list.attrib['type'] = 'family'
+                                subsubsubelement.attrib['optional'] = up['optional']
-#                                family_list.text = namespace + '.' + family.attrib['name']
-                            subsubelement.remove(subsubsubelement)
-                        if upgrade_help.get('targets', {}).get(subsubsubelement.text, {}).get('optional'):
-                            subsubsubelement.attrib['optional'] = upgrade_help.get('targets', {}).get(subsubsubelement.text, {}).get('optional')
                         has_target = False
                         for target in subsubelement:
                             if target.tag == 'target':
@@ -255,11 +208,7 @@ class RougailUpgrade:
                             subelement.remove(subsubelement)
                         continue
                     elif subsubsubelement.tag == 'slave':
-                        if subsubsubelement.text in upgrade_help.get('variables', {}).get('remove', []):
-                            subsubelement.remove(subsubsubelement)
-                            continue
                         subsubsubelement.tag = 'follower'
-                        subsubsubelement.text = normalize_family(subsubsubelement.text)
                     if subelement.tag == 'containers':
                         current_service = self.upgrade_container(subsubsubelement, current_service, files, ips, servicelists, upgrade_help)
                         subsubelement.remove(subsubsubelement)
@@ -334,12 +283,6 @@ class RougailUpgrade:
                         subelement.remove(subsubelement)
                     else:
                         self.move(subsubelement, 'master', 'leader')
-                        for follower in subsubelement:
-                            if '.' in subsubelement.attrib['leader']:
-                                path = subsubelement.attrib['leader'].rsplit('.', 1)[0] + '.' + follower.text
-                            else:
-                                path = follower.text
-                            self.remove(variables[path], 'multi', optional=True)
                         if subsubelement.attrib['leader'] in upgrade_help.get('groups', {}).get('reorder', {}):
                             for follower in subsubelement:
                                 subsubelement.remove(follower)
@@ -359,10 +302,6 @@ class RougailUpgrade:
                         continue
                     if subsubelement.attrib['name'] in upgrade_help.get('families', {}).get('hidden', {}).get('add', []):
                         subsubelement.attrib['hidden'] = 'True'
-                    if subsubelement.attrib['name'] != normalize_family(subsubelement.attrib['name']):
-                        if "description" not in subsubelement.attrib:
-                            subsubelement.attrib['description'] = subsubelement.attrib['name']
-                        subsubelement.attrib['name'] = normalize_family(subsubelement.attrib['name'])
                     families[subsubelement.attrib['name']] = subsubelement
             # if empty, remove
             if is_empty(subelement) or subelement.tag in ['containers', 'files', 'help']:
@@ -455,9 +394,7 @@ class RougailUpgrade:
         for name, text in variables_help.items():
             variables[name].attrib['help'] = text
         for name, text in families_help.items():
-            if name in upgrade_help.get('families', {}).get('rename', {}):
+            families[name].attrib['help'] = text
-                name = upgrade_help.get('families', {}).get('rename', {})[name]
-            families[normalize_family(name)].attrib['help'] = text
         for auto in autos:
             if auto in variables:
                 variables[auto].attrib['hidden'] = 'True'
@@ -499,8 +436,6 @@ class RougailUpgrade:
         service.attrib['name'] = service_name
         if service_name == 'unknown':
             service.attrib['manage'] = 'False'
-        if service_name in upgrade_help.get('services', {}).get('unmanage', []):
-            service.attrib['manage'] = 'False'
         service_elt[service_name] = service
         if upgrade_help.get('servicelists', {}).get(service_name):
             service.attrib['servicelist'] = upgrade_help.get('servicelists', {}).get(service_name)
@@ -515,15 +450,7 @@ class RougailUpgrade:
             elt.attrib['engine'] = 'creole_legacy'
             if (not 'instance_mode' in elt.attrib or elt.attrib['instance_mode'] != 'when_container') and \
                     elt.text not in upgrade_help.get('files', {}).get('remove', {}):
-                if elt.attrib.get('filelist') in upgrade_help.get('services', {}).get('filelist_service', {}):
+                files[current_service][elt.text] = elt
-                    elt_service = upgrade_help.get('services', {}).get('filelist_service', {})[elt.attrib['filelist']]
-                    if elt_service in files:
-                        service = elt_service
-                    else:
-                        service = current_service
-                else:
-                    service = current_service
-                files[service][elt.text] = elt
         elif elt.tag in ['host', 'disknod', 'fstab', 'interface', 'package', 'service_access']:
             pass
         elif elt.tag == 'service_restriction':
@@ -531,15 +458,7 @@ class RougailUpgrade:
                 if restriction.tag == 'ip' and restriction.text != '0.0.0.0':
                     self.remove(restriction, 'ip_type', optional=True)
                     self.remove(restriction, 'netmask_type', optional=True)
-                    if elt.attrib['service'] in upgrade_help.get('services', {}).get('rename', {}):
+                    ips[current_service].append(restriction)
-                        elt_service = upgrade_help.get('services', {}).get('rename', {})[elt.attrib['service']]
-                    else:
-                        elt_service = elt.attrib['service']
-                    if elt_service in ips:
-                        service = elt_service
-                    else:
-                        service = current_service
-                    ips[service].append(restriction)
         elif elt.tag == 'service':
             new_name = elt.text
             if current_service == 'unknown':

src/rougail/utils.py

@@ -26,26 +26,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 from typing import List
 from unicodedata import normalize, combining
-import re
 
 from importlib.machinery import SourceFileLoader
 from importlib.util import spec_from_loader, module_from_spec
 
-from .i18n import _
-from .error import DictConsistencyError
-
-NAME_REGEXP = re.compile(r"^[a-z0-9_]*$")
-
-
-def valid_variable_family_name(name: str,
-                               xmlfiles: List[str],
-                               ) -> None:
-    match = NAME_REGEXP.search(name)
-    if not match:
-        msg = _(f'invalid variable or family name "{name}" must only contains '
-                'lowercase ascii character, number or _')
-        raise DictConsistencyError(msg, 76, xmlfiles)
-
 
 def normalize_family(family_name: str) -> str:
     """replace space, accent, uppercase, ... by valid character

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

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

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

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

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

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="general" description="général">
+        <family name="général">
             <!-- this is a comment -->
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>

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

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="general" description="général">
+        <family name="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>

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

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="general" description="général">
+        <family name="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>

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

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="general" description="général">
+        <family name="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>

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

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

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

@@ -2,7 +2,7 @@
 <rougail version="0.9">
     <variables>
         <family name="general">
-            <variable name="domain" type="domainname" description="Description">
+            <variable name="domain" type="domain" description="Description">
                 <value>my.domain.name</value>
             </variable>
         </family>

tests/dictionaries/01fill_baseaccent/makedict/after.json

@@ -3,8 +3,8 @@
         "owner": "default",
         "value": "non"
     },
-    "rougail.general2.mode_conteneur_actif2": {
+    "rougail.general.mode_conteneur_actif1": {
         "owner": "default",
-        "value": "oui"
+        "value": "non"
     }
 }

tests/dictionaries/01fill_baseaccent/makedict/base.json

@@ -1,4 +1,4 @@
 {
     "rougail.general.mode_conteneur_actif": "non",
-    "rougail.general2.mode_conteneur_actif2": "oui"
+    "rougail.general.mode_conteneur_actif1": "non"
 }

tests/dictionaries/01fill_baseaccent/makedict/before.json

@@ -3,8 +3,8 @@
         "owner": "default",
         "value": "non"
     },
-    "rougail.general2.mode_conteneur_actif2": {
+    "rougail.general.mode_conteneur_actif1": {
         "owner": "default",
-        "value": "oui"
+        "value": "non"
     }
 }

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

@@ -11,7 +11,8 @@ try:
     from tiramisu3 import *
 except:
     from tiramisu import *
-option_3 = ChoiceOption(name="var", doc="New variable", values=Calculation(func.trange, Params((ParamValue(0), ParamValue(10)))), default=9, properties=frozenset({"mandatory", "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], properties=frozenset({"normal"}))
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamOption(option_4)))), 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/02autosave_hidden_frozenifin/00-base.xml

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

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

@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="var1">
-            <value>no</value>
-        </variable>
-        <variable name="var2" multi='True'/>
-    </variables>
-
-    <constraints>
-        <fill name="calc_value">
-            <param type="variable">var1</param>
-            <param type="boolean" name="multi">True</param>
-            <target>var2</target>
-        </fill>
-    </constraints>
-</rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/02fill_multi_calc_val/makedict/after.json

@@ -1,12 +0,0 @@
-{
-    "rougail.var1": {
-        "owner": "default",
-        "value": "no"
-    },
-    "rougail.var2": {
-        "owner": "default",
-        "value": [
-            "no"
-        ]
-    }
-}

tests/dictionaries/02fill_multi_calc_val/makedict/base.json

@@ -1,6 +0,0 @@
-{
-    "rougail.var1": "no",
-    "rougail.var2": [
-        "no"
-    ]
-}

tests/dictionaries/02fill_multi_calc_val/makedict/before.json

@@ -1,12 +0,0 @@
-{
-    "rougail.var1": {
-        "owner": "default",
-        "value": "no"
-    },
-    "rougail.var2": {
-        "owner": "default",
-        "value": [
-            "no"
-        ]
-    }
-}

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

@@ -1,17 +0,0 @@
-from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader, module_from_spec
-loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-spec = spec_from_loader(loader.name, loader)
-func = module_from_spec(spec)
-loader.exec_module(func)
-for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
-        setattr(func, key, value)
-try:
-    from tiramisu3 import *
-except:
-    from tiramisu import *
-option_2 = StrOption(name="var1", doc="var1", default="no", properties=frozenset({"mandatory", "normal"}))
-option_3 = StrOption(name="var2", doc="var2", multi=True, default=Calculation(func.calc_value, Params((ParamOption(option_2)), kwargs={'multi': ParamValue(True)})), properties=frozenset({"normal"}))
-option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="var1" multi='True'>
-            <value>no</value>
-            <value>yes</value>
-            <value>maybe</value>
-        </variable>
-        <variable name="var2" multi='True'/>
-    </variables>
-
-    <constraints>
-        <fill name="calc_value">
-            <param type="variable">var1</param>
-            <target>var2</target>
-        </fill>
-    </constraints>
-</rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/02fill_multi_calc_val_multi/makedict/after.json

@@ -1,18 +0,0 @@
-{
-    "rougail.var1": {
-        "owner": "default",
-        "value": [
-            "no",
-            "yes",
-            "maybe"
-        ]
-    },
-    "rougail.var2": {
-        "owner": "default",
-        "value": [
-            "no",
-            "yes",
-            "maybe"
-        ]
-    }
-}

tests/dictionaries/02fill_multi_calc_val_multi/makedict/base.json

@@ -1,12 +0,0 @@
-{
-    "rougail.var1": [
-        "no",
-        "yes",
-        "maybe"
-    ],
-    "rougail.var2": [
-        "no",
-        "yes",
-        "maybe"
-    ]
-}

tests/dictionaries/02fill_multi_calc_val_multi/makedict/before.json

@@ -1,18 +0,0 @@
-{
-    "rougail.var1": {
-        "owner": "default",
-        "value": [
-            "no",
-            "yes",
-            "maybe"
-        ]
-    },
-    "rougail.var2": {
-        "owner": "default",
-        "value": [
-            "no",
-            "yes",
-            "maybe"
-        ]
-    }
-}

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

@@ -1,17 +0,0 @@
-from importlib.machinery import SourceFileLoader
-from importlib.util import spec_from_loader, module_from_spec
-loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
-spec = spec_from_loader(loader.name, loader)
-func = module_from_spec(spec)
-loader.exec_module(func)
-for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
-        setattr(func, key, value)
-try:
-    from tiramisu3 import *
-except:
-    from tiramisu import *
-option_2 = StrOption(name="var1", doc="var1", multi=True, default=['no', 'yes', 'maybe'], default_multi="no", properties=frozenset({"mandatory", "normal"}))
-option_3 = StrOption(name="var2", doc="var2", multi=True, default=Calculation(func.calc_value, Params((ParamOption(option_2)))), properties=frozenset({"normal"}))
-option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

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

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

@@ -12,7 +12,7 @@ try:
 except:
     from tiramisu import *
 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(whole=False))), 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_option/tiramisu/base.py

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="b", properties=frozenset({"mandatory", "normal"}))
 option_4 = IntOption(name="int2", doc="No change", default=100, properties=frozenset({"mandatory", "normal"}))
-option_5 = IntOption(name="int", doc="No change", validators=[Calculation(func.valid_lower, Params((ParamSelfOption(whole=False)), kwargs={'mini': ParamValue(0), 'maxi': ParamOption(option_4)}), warnings_only=False)], properties=frozenset({"normal"}))
+option_5 = IntOption(name="int", doc="No change", validators=[Calculation(func.valid_lower, Params((ParamSelfOption()), kwargs={'mini': ParamValue(0), 'maxi': ParamOption(option_4)}), 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_optional/tiramisu/base.py

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 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(whole=False), ParamOption(option_5))), warnings_only=False)], properties=frozenset({"normal"}))
+option_4 = IntOption(name="int", doc="No change", validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5))), 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

@@ -12,7 +12,7 @@ try:
 except:
     from tiramisu import *
 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(whole=False), ParamOption(option_4))), 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))), 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

@@ -14,7 +14,7 @@ except:
 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(whole=False), ParamOption(option_4))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_4))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_5))), 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))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5))), 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

@@ -14,7 +14,7 @@ except:
 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(whole=False), ParamOption(option_4))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(whole=False), ParamOption(option_5))), 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))), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5))), 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

@@ -14,7 +14,7 @@ except:
 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(whole=False), ParamOption(option_4), ParamOption(option_5))), 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), ParamOption(option_5))), 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

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 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(whole=False), ParamOption(option_4))), 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))), 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

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 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(whole=False), ParamOption(option_4))), 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))), 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/10leadership_accent/makedict/after.json

@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general1.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general1.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}

tests/dictionaries/10leadership_accent/makedict/base.json

@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general1.leader.leader": []
+}

tests/dictionaries/10leadership_accent/makedict/before.json

@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general1.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general1.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}

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

@@ -0,0 +1,22 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+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="Followér1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal"}))
+option_8 = StrOption(name="follower2", doc="Followér2", multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7)))), 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])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

tests/dictionaries/10leadership_accent_leader/makedict/after.json

@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general1.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general1.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}

tests/dictionaries/10leadership_accent_leader/makedict/base.json

@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general1.leader.leader": []
+}

tests/dictionaries/10leadership_accent_leader/makedict/before.json

@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general1.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general1.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general1.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}

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

@@ -0,0 +1,22 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_6 = StrOption(name="leader", doc="Léader", 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)))), properties=frozenset({"normal"}))
+option_5 = Leadership(name="leader", doc="Léader", 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])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

tests/dictionaries/10leadership_familyaccent/makedict/after.json

@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}

tests/dictionaries/10leadership_familyaccent/makedict/base.json

@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.leader.leader": []
+}

tests/dictionaries/10leadership_familyaccent/makedict/before.json

@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}

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

@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+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)))), 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])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="general" description="général">
+        <family name="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
                 <value>oui</value>
             </variable>

tests/dictionaries/10load_disabled_if_inaccent_family/makedict/after.json

@@ -0,0 +1,18 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general2.mode_conteneur_actif3": {
+        "owner": "default",
+        "value": "non"
+    }
+}

tests/dictionaries/10load_disabled_if_inaccent_family/makedict/base.json

@@ -0,0 +1,6 @@
+{
+    "rougail.general.condition": "non",
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.mode_conteneur_actif2": "non",
+    "rougail.general2.mode_conteneur_actif3": "non"
+}

tests/dictionaries/10load_disabled_if_inaccent_family/makedict/before.json

@@ -0,0 +1,18 @@
+{
+    "rougail.general.condition": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general2.mode_conteneur_actif3": {
+        "owner": "default",
+        "value": "non"
+    }
+}

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

@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+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="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_2 = OptionDescription(name="general", doc="Général", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_7 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_6 = OptionDescription(name="general2", doc="Général2", children=[option_7], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_6])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="general" description="Général">
+        <family name="Général">
             <variable name="condition" type="string" description="No change">
                 <value>non</value>
             </variable>
@@ -12,7 +12,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <family name="general2" description="Général2">
+        <family name="Général2">
         </family>
     </variables>
 
@@ -21,7 +21,7 @@
             <param>oui</param>
             <target type="variable">mode_conteneur_actif</target>
             <target type="variable">mode_conteneur_actif2</target>
-            <target type="family">general2</target>
+            <target type="family">Général2</target>
         </condition>
     </constraints>
 </rougail>

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

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <family name="general" description="Général">
+        <family name="Général">
             <variable name="condition" type="string" description="No change">
                 <value>non</value>
             </variable>
@@ -12,7 +12,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <family name="general2" description="Général2">
+        <family name="Général2">
             <variable name="mode_conteneur_actif3" type="string" description="No change" hidden="True">
                 <value>non</value>
             </variable>
@@ -24,7 +24,7 @@
             <param>oui</param>
             <target type="variable">mode_conteneur_actif</target>
             <target type="variable">mode_conteneur_actif2</target>
-            <target type="family">general2</target>
+            <target type="family">Général2</target>
         </condition>
     </constraints>
 </rougail>

tests/dictionaries/10load_leadership_normalize_family/makedict/after.json

@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general_1.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general_1.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general_1.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}

tests/dictionaries/10load_leadership_normalize_family/makedict/base.json

@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general_1.leader.leader": []
+}

tests/dictionaries/10load_leadership_normalize_family/makedict/before.json

@@ -0,0 +1,18 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general_1.leader.leader": {
+        "owner": "default",
+        "value": []
+    },
+    "rougail.general_1.leader.follower1": {
+        "owner": [],
+        "value": []
+    },
+    "rougail.general_1.leader.follower2": {
+        "owner": [],
+        "value": []
+    }
+}

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

@@ -0,0 +1,22 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
+option_6 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({"mandatory"}))
+option_7 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal"}))
+option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"}))
+option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8], properties=frozenset({"basic"}))
+option_4 = OptionDescription(name="general_1", doc="general-1", children=[option_5], properties=frozenset({"basic"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

@@ -15,7 +15,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))))], properties=frozenset({"normal"}))
+option_8 = StrOption(name="follower2", doc="follower2", multi=submulti, default=Calculation(func.calc_val, Params((ParamOption(option_7)))), 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/11valid_enum_function/00-base.xml

@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <family name="general">
-            <variable name="var" type="number" description="New variable">
-                <value>9</value>
-            </variable>
-        </family>
-    </variables>
-    <constraints>
-        <check name="valid_enum">
-            <param type="function">trange</param>
-            <param type="number">0</param>
-            <param type="number">10</param>
-            <target>var</target>
-        </check>
-    </constraints>
-</rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/11valid_enum_function/makedict/after.json

@@ -1,6 +0,0 @@
-{
-    "rougail.general.var": {
-        "owner": "default",
-        "value": 9
-    }
-}

tests/dictionaries/11valid_enum_function/makedict/base.json

@@ -1,3 +0,0 @@
-{
-    "rougail.general.var": 9
-}

tests/dictionaries/11valid_enum_function/makedict/before.json

@@ -1,6 +0,0 @@
-{
-    "rougail.general.var": {
-        "owner": "default",
-        "value": 9
-    }
-}

tests/dictionaries/20family_appendaccent/makedict/after.json

@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.other.mode_conteneur_actif3": {
+        "owner": "default",
+        "value": "non"
+    }
+}

tests/dictionaries/20family_appendaccent/makedict/base.json

@@ -0,0 +1,5 @@
+{
+    "rougail.general.mode_conteneur_actif1": "non",
+    "rougail.general.mode_conteneur_actif2": "non",
+    "rougail.other.mode_conteneur_actif3": "non"
+}

tests/dictionaries/20family_appendaccent/makedict/before.json

@@ -0,0 +1,14 @@
+{
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif2": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.other.mode_conteneur_actif3": {
+        "owner": "default",
+        "value": "non"
+    }
+}

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

@@ -0,0 +1,21 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_7 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
+option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="Général", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_6 = OptionDescription(name="other", doc="Other", children=[option_7], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_6])
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

@@ -15,6 +15,6 @@ from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val1", 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", properties=frozenset({"normal"}))
-option_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[option_5], 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_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

@@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val1", 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="val", properties=frozenset({"mandatory", "normal"}))
-option_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[option_5], 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", default=Calculation(func.calc_val, Params((ParamDynOption(option_5, 'val1', option_4)))), 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])

tests/dictionaries/20family_dynamic_calc2/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_7 = StrOption(name="newvar", doc="No change", properties=frozenset({"normal"}))
 option_5 = StrOption(name="vardyn", doc="No change", default="val", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
-option_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[option_5], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
+option_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_7, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
 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

@@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val1", 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()))), properties=frozenset({"normal"}))
-option_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[option_5], 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"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4, option_6])