src/rougail/__init__.py

@@ -27,6 +27,5 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 from .convert import RougailConvert
 from .template.systemd import RougailSystemdTemplate
 from .config import RougailConfig
-from rougail.update import RougailUpgrade
 
-__ALL__ = ('RougailConvert', 'RougailSystemdTemplate', 'RougailConfig', 'RougailUpgrade')
+__ALL__ = ('RougailConvert', 'RougailSystemdTemplate', 'RougailConfig')

src/rougail/annotator/condition.py

@@ -81,7 +81,7 @@ class ConditionAnnotator(TargetAnnotator, ParamAnnotator, Walk):
             if variable.auto_save:
                 continue
             new_condition = self.objectspace.condition(variable.xmlfiles)
-            new_condition.name = 'auto_frozen_if_in'
+            new_condition.name = 'auto_frozen_if_not_in'
             new_condition.namespace = variable.namespace
             new_condition.source = self.objectspace.rougailconfig['auto_freeze_variable']
             new_param = self.objectspace.param(variable.xmlfiles)
@@ -149,7 +149,7 @@ class ConditionAnnotator(TargetAnnotator, ParamAnnotator, Walk):
         """
         if condition_name.startswith('hidden_if_'):
             return ['hidden', 'frozen', 'force_default_on_freeze']
-        if condition_name == 'auto_frozen_if_in':
+        if condition_name == 'auto_frozen_if_not_in':
             return ['frozen']
         return [condition_name.split('_', 1)[0]]
 
@@ -250,7 +250,6 @@ class ConditionAnnotator(TargetAnnotator, ParamAnnotator, Walk):
             param3.name = f'condition_{fill.index}'
             param3.type = 'variable'
             param3.text = condition.source.path
-            param3.propertyerror = False
             fill.param.append(param3)
             param4 = self.objectspace.param(target.xmlfiles)
             param4.name = f'expected_{fill.index}'

src/rougail/annotator/group.py

@@ -50,7 +50,7 @@ class GroupAnnotator:
             if group.leader in cache_paths:
                 leader_fam_path = cache_paths[group.leader]
             else:
-                leader_fam_path = self.objectspace.paths.get_variable_family_path(group.leader, group.xmlfiles)
+                leader_fam_path = self.objectspace.paths.get_variable_family_path(group.leader)
                 cache_paths[group.leader] = leader_fam_path
             follower_names = list(group.follower.keys())
             leader = self.objectspace.paths.get_variable(group.leader)

src/rougail/annotator/service.py

@@ -297,7 +297,7 @@ class ServiceAnnotator:
             msg = _(f'ip with ip_type "{variable.type}" must have netmask')
             raise DictConsistencyError(msg, 64, ip.xmlfiles)
         if hasattr(ip, 'netmask'):
-            netmask = self.objectspace.paths.get_variable(ip.netmask, ip.xmlfiles)
+            netmask = self.objectspace.paths.get_variable(ip.netmask)
             if netmask.type != 'netmask':
                 msg = _(f'netmask in ip must have type "netmask", not "{netmask.type}"')
                 raise DictConsistencyError(msg, 65, ip.xmlfiles)

src/rougail/data/rougail.dtd

@@ -67,7 +67,7 @@
 <!ATTLIST file group CDATA "root">
 <!ATTLIST file filelist CDATA #IMPLIED>
 <!ATTLIST file redefine (True|False) "False">
-<!ATTLIST file engine (none|creole|jinja2|creole_legacy) #IMPLIED>
+<!ATTLIST file engine (none|creole|jinja2) #IMPLIED>
 <!ATTLIST file included (no|name|content) "no">
 
 <!ELEMENT override EMPTY>

src/rougail/error.py

@@ -70,8 +70,3 @@ class DictConsistencyError(Exception):
             msg = _(f'{msg} in {display_xmlfiles(xmlfiles)}')
         super().__init__(msg)
         self.errno = errno
-
-
-class UpgradeError(Exception):
-    """Error during XML upgrade
-    """

src/rougail/path.py

@@ -187,11 +187,10 @@ class Path:
 
     def get_variable_family_path(self,
                                  name: str,
-                                 xmlfiles: List[str]=False,
                                  ) -> str:  # pylint: disable=C0111
         """Get the full path of a family
         """
-        return self._get_variable(name, xmlfiles=xmlfiles)['family']
+        return self._get_variable(name)['family']
 
     def get_variable_path(self,
                           name: str,

src/rougail/template/engine/__init__.py

@@ -1,4 +1,4 @@
-from . import none, creole, jinja2, creole_legacy
+from . import none, creole, jinja2
 
 
-__all__ = ('none', 'creole', 'jinja2', 'creole_legacy')
+__all__ = ('none', 'creole', 'jinja2')

src/rougail/template/engine/creole.py

@@ -63,13 +63,15 @@ class CheetahTemplate(Template):  # pylint: disable=W0223
         """Initialize Creole CheetahTemplate
         """
         if filename is not None:
-            super().__init__(file=filename,
+            Template.__init__(self,
-                             searchList=[context, eosfunc, extra_context],
+                              file=filename,
-                             )
+                              searchList=[context, eosfunc, extra_context],
+                              )
         else:
-            super().__init__(source=source,
+            Template.__init__(self,
-                             searchList=[context, eosfunc, extra_context],
+                              source=source,
-                             )
+                              searchList=[context, eosfunc, extra_context],
+                              )
 
     # FORK of Cheetah function, do not replace '\\' by '/'
     def serverSidePath(self,
@@ -90,7 +92,6 @@ class CheetahTemplate(Template):  # pylint: disable=W0223
             return None
 
 
-# Sync to creole_legacy.py
 def process(filename: str,
             source: str,
             true_destfilename: str,

src/rougail/template/engine/creole_legacy.py

@@ -1,131 +0,0 @@
-"""Legacy Creole engine
-
-Created by:
-EOLE (http://eole.orion.education.fr)
-Copyright (C) 2005-2018
-
-Forked by:
-Cadoles (http://www.cadoles.com)
-Copyright (C) 2021
-
-distribued with GPL-2 or later license
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-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
-"""
-
-
-from typing import Dict, Any
-from Cheetah.NameMapper import NotFound
-
-from .creole import CheetahTemplate as oriCheetahTemplate
-from ...i18n import _
-from ...utils import normalize_family
-from ...error import TemplateError
-
-
-@classmethod
-def cl_compile(kls, *args, **kwargs):
-    """Rewrite compile methode to force some settings
-    """
-    kwargs['compilerSettings'] = {'directiveStartToken' : u'%',
-                   'cheetahVarStartToken' : u'%%',
-                   'EOLSlurpToken' : u'%',
-                   'PSPStartToken' : u'µ' * 10,
-                   'PSPEndToken' : u'µ' * 10,
-                   'commentStartToken' : u'µ' * 10,
-                   'commentEndToken' : u'µ' * 10,
-                   'multiLineCommentStartToken' : u'µ' * 10,
-                   'multiLineCommentEndToken' : u'µ' * 10}
-    return kls.old_compile(*args, **kwargs)  # pylint: disable=E1101
-oriCheetahTemplate.compile = cl_compile
-
-
-class IsDefined:
-    """
-    filtre permettant de ne pas lever d'exception au cas où
-    la variable Creole n'est pas définie
-     """
-    def __init__(self, context):
-        self.context = context
-
-    def __call__(self, varname):
-        if '.' in varname:
-            splitted_var = varname.split('.')
-            if len(splitted_var) != 2:
-                msg = u"Group variables must be of type master.slave"
-                raise KeyError(msg)
-            master, slave = splitted_var
-            if master in self.context:
-                return slave in self.context[master].slave.keys()
-            return False   
-        else:
-            return varname in self.context
-
-
-class CheetahTemplate(oriCheetahTemplate):
-    def __init__(self,
-                 filename: str,
-                 source: str,
-                 context,
-                 eosfunc: Dict,
-                 extra_context: Dict,
-                 ):
-        extra_context['is_defined'] = IsDefined(context)
-        super().__init__(filename, source, context, eosfunc, extra_context)
-
-
-# Sync to creole.py
-def process(filename: str,
-            source: str,
-            true_destfilename: str,
-            destfilename: str,
-            destdir: str,
-            variable: Any,
-            rougail_variables_dict: Dict,
-            eosfunc: Dict,
-            ):
-    """Process a cheetah template
-    """
-    # full path of the destination file
-    try:
-        extra_context = {'normalize_family': normalize_family,
-                         'rougail_filename': true_destfilename,
-                         'rougail_destination_dir': destdir,
-                         }
-        if variable is not None:
-            extra_context['rougail_variable'] = variable
-        cheetah_template = CheetahTemplate(filename,
-                                           source,
-                                           rougail_variables_dict,
-                                           eosfunc,
-                                           extra_context,
-                                           )
-        data = str(cheetah_template)
-    except NotFound as err:  # pragma: no cover
-        varname = err.args[0][13:-1]
-        if filename:
-            msg = f"Error: unknown variable used in template {filename} to {destfilename}: {varname}"
-        else:
-            msg = f"Error: unknown variable used in file {destfilename}: {varname}"
-        raise TemplateError(_(msg)) from err
-    except Exception as err:  # pragma: no cover
-        if filename:
-            msg = _(f"Error while instantiating template {filename} to {destfilename}: {err}")
-        else:
-            msg = _(f"Error while instantiating filename {destfilename}: {err}")
-        raise TemplateError(msg) from err
-
-    with open(destfilename, 'w') as file_h:
-        file_h.write(data)

src/rougail/tiramisureflector.py

@@ -219,7 +219,7 @@ class Common:
         """Populate properties
         """
         option_name = child.source.reflector_object.get()
-        kwargs = (f"'condition': ParamOption({option_name}, todict=True, notraisepropertyerror=True), "
+        kwargs = (f"'condition': ParamOption({option_name}, todict=True), "
                   f"'expected': {self.populate_param(child.expected)}")
         if child.inverse:
             kwargs += ", 'reverse_condition': ParamValue(True)"
@@ -267,8 +267,7 @@ class Common:
         params = [f'{option_name}']
         if hasattr(param, 'suffix'):
             param_type = 'ParamDynOption'
-            family = param.family.reflector_object.get()
+            params.extend([f"'{param.suffix}'", f'{param.family.reflector_name}'])
-            params.extend([f"'{param.suffix}'", f'{family}'])
         else:
             param_type = 'ParamOption'
         if not param.propertyerror:
@@ -329,22 +328,14 @@ class Variable(Common):
         kwargs = []
         # has parameters
         function = child.name
-        new_args = []
         if hasattr(child, 'param'):
             for param in child.param:
                 value = self.populate_param(param)
                 if not hasattr(param, 'name'):
-#                    args.append(str(value))
+                    args.append(str(value))
-                    new_args.append(str(value))
                 else:
                     kwargs.append(f"'{param.name}': " + value)
-#        ret = f'Calculation(func.{function}, Params((' + ', '.join(args) + ')'
+        ret = f'Calculation(func.{function}, Params((' + ', '.join(args) + ')'
-        if function == 'valid_network_netmask':
-            new_args.extend(args)
-        else:
-            args.extend(new_args)
-            new_args = args
-        ret = f'Calculation(func.{function}, Params((' + ', '.join(new_args) + ')'
         if kwargs:
             ret += ', kwargs={' + ', '.join(kwargs) + '}'
         ret += ')'

src/rougail/update.py

@@ -1,486 +0,0 @@
-"""Update Rougail XML file to new version
-
-Cadoles (http://www.cadoles.com)
-Copyright (C) 2021
-
-distribued with GPL-2 or later license
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-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
-"""
-
-from typing import List
-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 .i18n import _
-from .error import UpgradeError
-
-
-VERSIONS = {'creole': ['1'],
-            'rougail': ['0.9'],
-            }
-
-
-def get_function_name(root, version):
-    version = version.replace('.', '_')
-    return f'update_{root}_{version}'
-
-
-FUNCTION_VERSIONS = [get_function_name(root, version) for root, versions in VERSIONS.items() for version in versions]
-
-
-class RougailUpgrade:
-    def __init__(self, test=False, upgrade_help=None):
-        self.test = test
-        if upgrade_help is None:
-            upgrade_help = {}
-        self.upgrade_help = upgrade_help
-
-    def load_xml_from_folders(self,
-                              srcfolder: str,
-                              dstfolder: str,
-                              ):
-        """Loads all the XML files located in the xmlfolders' list
-
-        :param xmlfolders: list of full folder's name
-        """
-        filenames = [filename for filename in listdir(srcfolder) if filename.endswith('.xml')]
-        filenames.sort()
-        for filename in filenames:
-            xmlsrc = join(srcfolder, filename)
-            xmldst = join(dstfolder, filename)
-            try:
-                parser = XMLParser(remove_blank_text=True)
-                document = parse(xmlsrc, parser)
-            except XMLSyntaxError as err:
-                raise Exception(_(f'not a XML file: {err}')) from err
-            root = document.getroot()
-            search_function_name = get_function_name(root.tag, root.attrib.get('version', '1'))
-            function_found = False
-            for function_version in FUNCTION_VERSIONS:
-                if function_found and hasattr(self, function_version):
-                    upgrade_help = self.upgrade_help.get(function_version, {}).get(filename, {})
-                    root = getattr(self, function_version)(root, upgrade_help)
-                if function_version == search_function_name:
-                    function_found = True
-            with open(xmldst, 'wb') as xmlfh:
-                xmlfh.write(tostring(root, pretty_print=True, encoding="UTF-8", xml_declaration=True))
-    #            if
-    #            if not self.dtd.validate(document):
-    #                dtd_error = self.dtd.error_log.filter_from_errors()[0]
-    #                msg = _(f'not a valid XML file: {dtd_error}')
-    #                raise DictConsistencyError(msg, 43, [xmlfile])
-    #            yield xmlfile, document.getroot()
-
-
-    def update_rougail_0_9(self,
-                           root: 'Element',
-                           upgrade_help: dict,
-                           ) -> 'Element':
-        # rename root
-        root.tag = 'rougail'
-        root.attrib['version'] = '0.9'
-        variables_auto_valid_enum = {}
-        variables_help = {}
-        families_help = {}
-        variables = {}
-        families = {}
-        valid_enums = {}
-        current_service = upgrade_help.get('services', {}).get('default', 'unknown')
-        files = {current_service: {}}
-        ips = {current_service: []}
-        servicelists = {}
-        test_unknowns_variables = set()
-        autos = []
-        constraints_obj = None
-        for subelement in root:
-            if not isinstance(subelement.tag, str):
-                # XML comment
-                continue
-            for subsubelement in subelement:
-                if not isinstance(subsubelement.tag, str):
-                    # XML comment
-                    continue
-                for subsubsubelement in subsubelement:
-                    if not isinstance(subsubsubelement.tag, str):
-                        # XML comment
-                        continue
-                    if subsubsubelement.tag == 'variable':
-                        if subsubsubelement.attrib['name'] in upgrade_help.get('variables', {}).get('remove', []):
-                            subsubelement.remove(subsubsubelement)
-                            continue
-                        if subsubsubelement.attrib['name'] in upgrade_help.get('variables', {}).get('type', {}):
-                            subsubsubelement.attrib['type'] = upgrade_help['variables']['type'][subsubsubelement.attrib['name']]
-                        if subsubsubelement.attrib['name'] in upgrade_help.get('variables', {}).get('hidden', {}).get('add', []):
-                            subsubsubelement.attrib['hidden'] = 'True'
-                        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', optional=True)
-                        variables[subsubsubelement.attrib['name']] = subsubsubelement
-                        type = subsubsubelement.attrib.get('type')
-                        if type in ['oui/non', 'yes/no', 'on/off']:
-                            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 == 'domain_strict':
-                            subsubsubelement.attrib['type'] = 'domain'
-                        elif type == 'string':
-                            del subsubsubelement.attrib['type']
-                        if self.test and subsubsubelement.attrib.get('auto_freeze') == 'True':
-                            del subsubsubelement.attrib['auto_freeze']
-                        #if self.test and subsubsubelement.attrib.get('redefine') == 'True':
-                        #    subsubsubelement.attrib['exists'] = 'False'
-                        #    del subsubsubelement.attrib['redefine']
-                        if subsubsubelement.attrib['name'] in upgrade_help.get('variables', {}).get('redefine', {}).get('remove', {}):
-                            del subsubsubelement.attrib['redefine']
-                        if subsubsubelement.attrib['name'] in upgrade_help.get('variables', {}).get('remove_check', []):
-                            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('test', {}):
-                            subsubsubelement.attrib['test'] = upgrade_help.get('variables', {}).get('test', {})[subsubsubelement.attrib['name']]
-#                        for value in subsubsubelement:
-#                            if value.text is None:
-#                                value.attrib['type'] = 'nil'
-                    elif subsubsubelement.tag == 'param':
-                        type = subsubsubelement.attrib.get('type')
-                        if type == 'eole':
-                            subsubsubelement.attrib['type'] = 'variable'
-                            type = 'variable'
-                        elif type in ('container', 'context', 'python'):
-                            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'
-                        if subsubelement.attrib['name'] == 'valid_enum' and not type:
-                            if subsubsubelement.attrib.get('name') == 'checkval':
-                                raise UpgradeError(_('checkval in valid_enum is no more supported'))
-                            for val in eval(subsubsubelement.text):
-                                SubElement(subsubelement, 'param').text = str(val)
-                            subsubelement.remove(subsubsubelement)
-                        self.move(subsubsubelement, 'hidden', 'propertyerror', optional=True)
-                        if type == 'variable' and subsubsubelement.text in upgrade_help.get('variables', {}).get('rename', []):
-                            subsubsubelement.text = upgrade_help.get('variables', {}).get('rename', [])[subsubsubelement.text]
-                        up = upgrade_help.get('params', {}).get(subsubsubelement.text)
-                        if up:
-                            if 'text' in up:
-                                subsubsubelement.text = up['text']
-                            if 'type' in up:
-                                subsubsubelement.attrib['type'] = up['type']
-                    elif subsubsubelement.tag == 'target':
-                        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)
-                        up = upgrade_help.get('targets', {}).get(subsubsubelement.text)
-                        if up:
-                            if 'optional' in up:
-                                subsubsubelement.attrib['optional'] = up['optional']
-                        has_target = False
-                        for target in subsubelement:
-                            if target.tag == 'target':
-                                has_target = True
-                                break
-                        if not has_target:
-                            subelement.remove(subsubelement)
-                        continue
-                    elif subsubsubelement.tag == 'slave':
-                        subsubsubelement.tag = 'follower'
-                    if subelement.tag == 'containers':
-                        current_service = self.upgrade_container(subsubsubelement, current_service, files, ips, servicelists, upgrade_help)
-                        subsubelement.remove(subsubsubelement)
-                if subelement.tag == 'help':
-                    if subsubelement.tag == 'variable':
-                        if not subsubelement.attrib['name'] in upgrade_help.get('variables', {}).get('remove', []):
-                            variables_help[subsubelement.attrib['name']] = subsubelement.text
-                    elif subsubelement.tag == 'family':
-                        if subsubelement.attrib['name'] not in upgrade_help.get('families', {}).get('remove', []):
-                            families_help[subsubelement.attrib['name']] = subsubelement.text
-                    else:
-                        raise Exception(f'unknown help tag {subsubelement.tag}')
-                    subelement.remove(subsubelement)
-                    continue
-                if subsubelement.tag == 'auto':
-                    if subsubelement.attrib['target'] in upgrade_help.get('variables', {}).get('remove', []):
-                        subelement.remove(subsubelement)
-                        continue
-                    autos.append(subsubelement.attrib['target'])
-                    subsubelement.tag = 'fill'
-                if subsubelement.tag in ['fill', 'check']:
-                    if subsubelement.tag == 'check' and subsubelement.attrib['name'] == 'valid_enum':
-                        if subsubelement.attrib['target'] in upgrade_help.get('variables', {}).get('remove', []):
-                            subelement.remove(subsubelement)
-                            continue
-                        params = []
-                        for param in subsubelement:
-                            if param.tag == 'param':
-                                params.append(param.text)
-                        key = '~'.join(params)
-                        if key in valid_enums:
-                            SubElement(valid_enums[key], 'target').text = subsubelement.attrib['target']
-                            subelement.remove(subsubelement)
-                            continue
-                        valid_enums['~'.join(params)] = subsubelement
-                    if subsubelement.tag == 'fill' and subsubelement.attrib['target'] in upgrade_help.get('fills', {}).get('remove', []):
-                        subelement.remove(subsubelement)
-                        continue
-                    if subsubelement.attrib['target'] in upgrade_help.get('variables', {}).get('remove', []):
-                        subelement.remove(subsubelement)
-                        continue
-                    if subsubelement.attrib['name'] == 'valid_networknetmask':
-                        subsubelement.attrib['name'] = 'valid_network_netmask'
-                    target = SubElement(subsubelement, 'target')
-                    target.text = subsubelement.attrib['target']
-                    if self.test:
-                        target.attrib['optional'] = 'True'
-                    del subsubelement.attrib['target']
-                elif subsubelement.tag == 'separators':
-                    subelement.remove(subsubelement)
-                elif subsubelement.tag == 'condition':
-                    if subsubelement.attrib['source'] in upgrade_help.get('variables', {}).get('remove', []):
-                        try:
-                            subelement.remove(subsubelement)
-                        except:
-                            pass
-                    else:
-                        if subsubelement.attrib['name'] == 'hidden_if_not_in':
-                            subsubelement.attrib['name'] = 'disabled_if_not_in'
-                        if subsubelement.attrib['name'] == 'hidden_if_in':
-                            subsubelement.attrib['name'] = 'disabled_if_in'
-                        if subsubelement.attrib['name'] == 'frozen_if_in':
-                            subsubelement.attrib['name'] = 'hidden_if_in'
-                        self.move(subsubelement, 'fallback', 'optional', optional='True')
-                    if subsubelement.attrib['source'] in upgrade_help.get('variables', {}).get('rename', []):
-                        subsubelement.attrib['source'] = upgrade_help.get('variables', {}).get('rename', [])[subsubelement.attrib['source']]
-                elif subsubelement.tag == 'group':
-                    if subsubelement.attrib['master'] in upgrade_help.get('groups', {}).get('remove', []):
-                        subelement.remove(subsubelement)
-                    else:
-                        self.move(subsubelement, 'master', 'leader')
-                        if subsubelement.attrib['leader'] in upgrade_help.get('groups', {}).get('reorder', {}):
-                            for follower in subsubelement:
-                                subsubelement.remove(follower)
-                            for follower in upgrade_help.get('groups', {}).get('reorder', {})[subsubelement.attrib['leader']]:
-                                SubElement(subsubelement, 'follower').text = follower
-                if subelement.tag == 'files':
-                    current_service = self.upgrade_container(subsubelement, current_service, files, ips, servicelists, upgrade_help)
-                    subelement.remove(subsubelement)
-                if subsubelement.tag == 'family':
-                    self.remove(subsubelement, 'icon', optional=True)
-                    if subsubelement.attrib['name'] in upgrade_help.get('families', {}).get('mode', {}).get('remove', []) and 'mode' in subsubelement.attrib:
-                        del subsubelement.attrib['mode']
-                    if subsubelement.attrib['name'] in upgrade_help.get('families', {}).get('rename', {}):
-                        subsubelement.attrib['name'] = upgrade_help.get('families', {}).get('rename', {})[subsubelement.attrib['name']]
-                    if subsubelement.attrib['name'] in upgrade_help.get('families', {}).get('remove', []):
-                        subelement.remove(subsubelement)
-                        continue
-                    if subsubelement.attrib['name'] in upgrade_help.get('families', {}).get('hidden', {}).get('add', []):
-                        subsubelement.attrib['hidden'] = 'True'
-                    families[subsubelement.attrib['name']] = subsubelement
-            # if empty, remove
-            if is_empty(subelement) or subelement.tag in ['containers', 'files', 'help']:
-                root.remove(subelement)
-                continue
-            # copy subelement
-            if subelement.tag == 'constraints':
-                constraints_obj = subelement
-        services = None
-        service_elt = {}
-        for variable, obj in upgrade_help.get('variables', {}).get('add', {}).items():
-            family = next(iter(families.values()))
-            variables[variable] = SubElement(family, 'variable', name=variable)
-            if 'value' in obj:
-                SubElement(variables[variable], 'value').text = obj['value']
-            for name in ['hidden', 'exists']:
-                if name in obj:
-                    variables[variable].attrib[name] = obj[name]
-        files_is_empty = True
-        for lst in files.values():
-            if len(lst):
-                files_is_empty = False
-                break
-        if not files_is_empty:
-            services = Element('services')
-            root.insert(0, services)
-            for service_name, lst in files.items():
-                service = self.create_service(services, service_name, service_elt, servicelists, upgrade_help)
-                for file_ in lst.values():
-                    self.move(file_, 'name_type', 'file_type', optional=True)
-                    if 'file_type' in file_.attrib and file_.attrib['file_type'] == 'SymLinkOption':
-                        file_.attrib['file_type'] = 'variable'
-                        if variables[file_.text].attrib['type'] == 'string':
-                            variables[file_.text].attrib['type'] = 'filename'
-                    self.remove(file_, 'rm', optional=True)
-                    self.remove(file_, 'mkdir', optional=True)
-                    service.append(file_)
-        ips_is_empty = True
-        for lst in ips.values():
-            if len(lst):
-                ips_is_empty = False
-                break
-        if not ips_is_empty:
-            if services is None:
-                services = Element('services')
-                root.insert(0, services)
-            for service_name, lst in ips.items():
-                service = self.create_service(services, service_name, service_elt, servicelists, upgrade_help)
-                for ip in lst:
-                    if ip.text in upgrade_help.get('ips', {}).get('remove', []):
-                        continue
-                    for type in ['ip_type', 'netmask_type']:
-                        if type in ip.attrib and ip.attrib[type] == 'SymLinkOption':
-                            ip.attrib[type] = 'variable'
-                    if 'netmask' in ip.attrib:
-                        if ip.attrib['netmask'] == '255.255.255.255':
-                            del ip.attrib['netmask']
-                            if ip.text in variables and 'type' not in variables[ip.text].attrib:
-                                variables[ip.text].attrib['type'] = 'ip'
-                        else:
-                            if ip.text in variables and 'type' not in variables[ip.text].attrib:
-                                variables[ip.text].attrib['type'] = 'network'
-                            if ip.attrib['netmask'] in variables and 'type' not in variables[ip.attrib['netmask']].attrib:
-                                variables[ip.attrib['netmask']].attrib['type'] = 'netmask'
-                    elif ip.text in variables and 'type' not in variables[ip.text].attrib:
-                        variables[ip.text].attrib['type'] = 'ip'
-                    self.remove(ip, 'interface')
-                    self.remove(ip, 'interface_type', optional=True)
-                    self.remove(ip, 'service_restrictionlist', optional=True)
-                    service.append(ip)
-        if ips_is_empty and files_is_empty:
-            for service_name in files:
-                if services is None:
-                    services = Element('services')
-                    root.insert(0, services)
-                if service_name != 'unknown':
-                    self.create_service(services, service_name, service_elt, servicelists, upgrade_help)
-        if constraints_obj is None:
-            constraints_obj = SubElement(root, 'constraints')
-        if variables_auto_valid_enum:
-            for type, variables_valid_enum in variables_auto_valid_enum.items():
-                valid_enum = SubElement(constraints_obj, 'check')
-                valid_enum.attrib['name'] = 'valid_enum'
-                for val in type.split('/'):
-                    param = SubElement(valid_enum, 'param')
-                    param.text = val
-                for variable in variables_valid_enum:
-                    target = SubElement(valid_enum, 'target')
-                    target.text = variable
-        for name, text in variables_help.items():
-            variables[name].attrib['help'] = text
-        for name, text in families_help.items():
-            families[name].attrib['help'] = text
-        for auto in autos:
-            if auto in variables:
-                variables[auto].attrib['hidden'] = 'True'
-            else:
-                # redefine value in first family
-                family = next(iter(families.values()))
-                variable = SubElement(family, 'variable', name=auto, redefine="True", hidden="True")
-                if self.test:
-                    del variable.attrib['redefine']
-        return root
-
-    @staticmethod
-    def move(elt, src, dst, optional=False):
-        if src == 'text':
-            value = elt.text
-            elt.text = None
-        else:
-            if optional and src not in elt.attrib:
-                return
-            value = elt.attrib[src]
-            del elt.attrib[src]
-        #
-        if dst == 'text':
-            elt.text = value
-        else:
-            elt.attrib[dst] = value
-
-    @staticmethod
-    def remove(elt, src, optional=False):
-        if optional and src not in elt.attrib:
-            return
-        del elt.attrib[src]
-
-    @staticmethod
-    def create_service(services, service_name, service_elt, servicelists, upgrade_help):
-        if service_name in service_elt:
-            return service_elt[service_name]
-        service = SubElement(services, 'service')
-        service.attrib['name'] = service_name
-        if service_name == 'unknown':
-            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)
-        elif service_name in servicelists:
-            service.attrib['servicelist'] = servicelists[service_name]
-        return service
-
-    def upgrade_container(self, elt, current_service, files, ips, servicelists, upgrade_help):
-        if elt.tag == 'file':
-            self.move(elt, 'name', 'text')
-            self.remove(elt, 'del_comment', optional=True)
-            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', {}):
-                files[current_service][elt.text] = elt
-        elif elt.tag in ['host', 'disknod', 'fstab', 'interface', 'package', 'service_access']:
-            pass
-        elif elt.tag == 'service_restriction':
-            for restriction in elt:
-                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)
-                    ips[current_service].append(restriction)
-        elif elt.tag == 'service':
-            new_name = elt.text
-            if current_service == 'unknown':
-                if new_name in files:
-                    raise Exception('hu?')
-                files[new_name] = files[current_service]
-                del files[current_service]
-                ips[new_name] = ips[current_service]
-                del ips[current_service]
-            elif new_name not in files:
-                files[new_name] = {}
-                ips[new_name] = []
-            current_service = new_name
-            if 'servicelist' in elt.attrib:
-                servicelists[current_service] = elt.attrib['servicelist']
-        else:
-            raise Exception(f'unknown containers tag {elt.tag}')
-        return current_service
-
-
-def is_empty(elt, not_check_attrib=False):
-    if not not_check_attrib and elt.attrib:
-        return False
-    empty = True
-    for file_ in elt:
-        empty = False
-    return empty
-
-
-def update_creole_1():
-    print('pfff')

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

@@ -12,6 +12,6 @@ try:
 except:
     from tiramisu import *
 option_3 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
-option_2 = StrOption(name="myvar", doc="myvar", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
+option_2 = StrOption(name="myvar", doc="myvar", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

@@ -12,6 +12,6 @@ try:
 except:
     from tiramisu import *
 option_3 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
-option_2 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"expert", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
+option_2 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"expert", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

@@ -12,6 +12,6 @@ try:
 except:
     from tiramisu import *
 option_2 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
-option_3 = StrOption(name="my_variable", doc="my_variable", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", "hidden", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
+option_3 = StrOption(name="my_variable", doc="my_variable", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", "hidden", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

@@ -13,6 +13,6 @@ except:
     from tiramisu import *
 option_3 = StrOption(name="my_var2", doc="my_var2", default="no", properties=frozenset({"mandatory", "normal"}))
 option_4 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
-option_2 = StrOption(name="my_var1", doc="my_var1", default=Calculation(func.calc_val, Params((ParamOption(option_3)))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
+option_2 = StrOption(name="my_var1", doc="my_var1", default=Calculation(func.calc_val, Params((ParamOption(option_3)))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3, option_4])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

@@ -12,6 +12,6 @@ try:
 except:
     from tiramisu import *
 option_2 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
-option_3 = StrOption(name="my_var", doc="my_var", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
+option_3 = StrOption(name="my_var", doc="my_var", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_2, todict=True), 'expected': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

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

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

@@ -13,10 +13,10 @@ except:
     from tiramisu import *
 option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"}))
-option_6 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
+option_6 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("non")}))}))
-option_7 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
+option_7 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("non")}))}))
-option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
+option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("non")}))}))
-option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
+option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("non")}))}))
 option_4 = OptionDescription(name="leadermode", doc="leadermode", 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_leader_hidden_if_in_name/tiramisu/base.py

@@ -13,10 +13,10 @@ except:
     from tiramisu import *
 option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"}))
-option_6 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
+option_6 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("non")}))}))
-option_7 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
+option_7 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("non")}))}))
-option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
+option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("non")}))}))
-option_5 = Leadership(name="other", doc="other", children=[option_6, option_7, option_8], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
+option_5 = Leadership(name="other", doc="other", children=[option_6, option_7, option_8], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("non")}))}))
 option_4 = OptionDescription(name="leadermode", doc="leadermode", 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/10load_disabled_if_in/tiramisu/base.py

@@ -12,8 +12,8 @@ try:
 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({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")}))}))
-option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "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({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")}))}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

@@ -12,7 +12,7 @@ try:
 except:
     from tiramisu import *
 option_3 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"}))
-option_4 = StrOption(name="variable1", doc="variable1", properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("no")}))}))
+option_4 = StrOption(name="variable1", doc="variable1", properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("no")}))}))
 option_5 = StrOption(name="variable2", doc="variable2", default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=True)))), 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])

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

@@ -12,8 +12,8 @@ try:
 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({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("maybe")}))}))
-option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("maybe")}))}))
 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_10 = StrOption(name="engine", doc="engine", default="creole")
@@ -23,7 +23,7 @@ option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
 option_15 = StrOption(name="owner", doc="owner", default="root")
 option_16 = StrOption(name="source", doc="source", default="file1")
-option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["oui", "maybe"]), 'condition_operator': ParamValue("OR")})))
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue(["oui", "maybe"]), 'condition_operator': ParamValue("OR")})))
 option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
 option_18 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 option_3 = StrOption(name="condition", doc="No change", default="no", properties=frozenset({"mandatory", "normal"}))
 option_4 = StrOption(name="condition2", doc="No change", default="no", properties=frozenset({"mandatory", "normal"}))
-option_5 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
+option_5 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("maybe")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue("maybe")}))}))
 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_10 = StrOption(name="engine", doc="engine", default="creole")
@@ -23,7 +23,7 @@ option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
 option_15 = StrOption(name="owner", doc="owner", default="root")
 option_16 = StrOption(name="source", doc="source", default="file1")
-option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])})))
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue(["yes", "maybe"]), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4), 'expected_1': ParamValue(["yes", "maybe"])})))
 option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
 option_18 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 option_3 = StrOption(name="condition", doc="No change", default="no", properties=frozenset({"mandatory", "normal"}))
 option_4 = StrOption(name="condition2", doc="No change", default="no", properties=frozenset({"mandatory", "normal"}))
-option_5 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
+option_5 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue("maybe")}))}))
 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_10 = StrOption(name="engine", doc="engine", default="creole")
@@ -23,7 +23,7 @@ option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
 option_15 = StrOption(name="owner", doc="owner", default="root")
 option_16 = StrOption(name="source", doc="source", default="file1")
-option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])})))
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4), 'expected_1': ParamValue(["yes", "maybe"])})))
 option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
 option_18 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 option_3 = StrOption(name="condition", doc="No change", default="yes", properties=frozenset({"mandatory", "normal"}))
 option_4 = StrOption(name="condition2", doc="No change", default="no", properties=frozenset({"mandatory", "normal"}))
-option_5 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
+option_5 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue("maybe")}))}))
 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_10 = StrOption(name="engine", doc="engine", default="creole")
@@ -23,7 +23,7 @@ option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
 option_15 = StrOption(name="owner", doc="owner", default="root")
 option_16 = StrOption(name="source", doc="source", default="file1")
-option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])})))
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4), 'expected_1': ParamValue(["yes", "maybe"])})))
 option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
 option_18 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 option_3 = StrOption(name="condition", doc="No change", default="yes", properties=frozenset({"mandatory", "normal"}))
 option_4 = StrOption(name="condition2", doc="No change", default="yes", properties=frozenset({"mandatory", "normal"}))
-option_5 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
+option_5 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue("maybe")}))}))
 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_10 = StrOption(name="engine", doc="engine", default="creole")
@@ -23,7 +23,7 @@ option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
 option_15 = StrOption(name="owner", doc="owner", default="root")
 option_16 = StrOption(name="source", doc="source", default="file1")
-option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])})))
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4), 'expected_1': ParamValue(["yes", "maybe"])})))
 option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
 option_18 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 option_3 = StrOption(name="condition", doc="No change", default="no", properties=frozenset({"mandatory", "normal"}))
 option_4 = StrOption(name="condition2", doc="No change", default="yes", properties=frozenset({"mandatory", "normal"}))
-option_5 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
+option_5 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue("maybe")}))}))
 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_10 = StrOption(name="engine", doc="engine", default="creole")
@@ -23,7 +23,7 @@ option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
 option_15 = StrOption(name="owner", doc="owner", default="root")
 option_16 = StrOption(name="source", doc="source", default="file1")
-option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])})))
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4), 'expected_1': ParamValue(["yes", "maybe"])})))
 option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
 option_18 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -12,8 +12,8 @@ try:
 except:
     from tiramisu import *
 option_3 = StrOption(name="condition", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"}))
-option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("maybe")}))}))
-option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("maybe")}))}))
 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_10 = StrOption(name="engine", doc="engine", default="creole")
@@ -23,7 +23,7 @@ option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
 option_15 = StrOption(name="owner", doc="owner", default="root")
 option_16 = StrOption(name="source", doc="source", default="file1")
-option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["oui", "maybe"]), 'condition_operator': ParamValue("OR")})))
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue(["oui", "maybe"]), 'condition_operator': ParamValue("OR")})))
 option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
 option_18 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -12,8 +12,8 @@ try:
 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({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue(None)}))}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue(None)}))}))
-option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue(None)}))}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue(None)}))}))
 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/10load_disabled_if_in_twice/00-base.xml

@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.9">
-    <variables>
-        <variable name="my_var1">
-            <value>no</value>
-        </variable>
-        <variable name="my_var2">
-            <value>no</value>
-        </variable>
-        <variable name="my_var3">
-            <value>no</value>
-        </variable>
-    </variables>
-
-    <constraints>
-      <condition name="disabled_if_in" source="my_var1">
-          <param>no</param>
-          <target type="variable">my_var2</target>
-      </condition>
-      <condition name="disabled_if_in" source="my_var2">
-          <param>no</param>
-          <target type="variable">my_var3</target>
-      </condition>
-    </constraints>
-</rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

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

@@ -1,6 +0,0 @@
-{
-    "rougail.my_var1": {
-        "owner": "default",
-        "value": "no"
-    }
-}

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

@@ -1,3 +0,0 @@
-{
-    "rougail.my_var1": "no"
-}

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

@@ -1,6 +0,0 @@
-{
-    "rougail.my_var1": {
-        "owner": "default",
-        "value": "no"
-    }
-}

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

@@ -1,18 +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="my_var1", doc="my_var1", default="no", properties=frozenset({"mandatory", "normal"}))
-option_3 = StrOption(name="my_var2", doc="my_var2", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("no")}))}))
-option_4 = StrOption(name="my_var3", doc="my_var3", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("no")}))}))
-option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3, option_4])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 option_3 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"}))
 option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="tous", properties=frozenset({"mandatory", "normal"}))
-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': ParamOption(option_4)}))}))
+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), 'expected': ParamOption(option_4)}))}))
 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/10load_disabled_if_in_variable2/tiramisu/base.py

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 option_3 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"}))
 option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="aucun", properties=frozenset({"mandatory", "normal"}))
-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': ParamOption(option_4)}))}))
+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), 'expected': ParamOption(option_4)}))}))
 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/10load_disabled_if_inaccent_family/tiramisu/base.py

@@ -12,10 +12,10 @@ try:
 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_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), '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_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), '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_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), '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_disabledifin_fallback/tiramisu/base.py

@@ -13,7 +13,7 @@ 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({"disabled", "mandatory", "normal"}))
-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_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), 'expected': ParamValue("oui")}))}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

@@ -12,8 +12,8 @@ try:
 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_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), '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_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), 'expected': ParamValue("oui")}))}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

@@ -12,8 +12,8 @@ try:
 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_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), '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_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), 'expected': ParamValue("oui")}))}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

@@ -12,8 +12,8 @@ try:
 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('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")}))}))
-option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), 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('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")}))}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

@@ -12,8 +12,8 @@ try:
 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=Calculation(func.calc_val, Params((ParamValue("non")))), properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("non")))), properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")}))}))
-option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), 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('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")}))}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

@@ -12,8 +12,8 @@ try:
 except:
     from tiramisu import *
 option_3 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", 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('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}))}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("authentifié")}))}))
-option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("authentifié")}))}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("tous")})), Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("authentifié")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("authentifié")}))}))
 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/10load_frozenifin_variable/tiramisu/base.py

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 option_3 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"}))
 option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="tous", properties=frozenset({"mandatory", "normal"}))
-option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_4)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_4)})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamOption(option_4)}))}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamOption(option_4)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamOption(option_4)})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamOption(option_4)}))}))
 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/10load_frozenifnotin/tiramisu/base.py

@@ -12,8 +12,8 @@ try:
 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('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}))}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}))}))
-option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}))}))
+option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui"), 'reverse_condition': ParamValue(True)}))}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, 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/10load_hidden_if_empty_family/tiramisu/base.py

@@ -12,8 +12,8 @@ try:
 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('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")}))}))
-option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), 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('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")}))}))
 option_2 = OptionDescription(name="general", doc="Général", 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/10load_hidden_if_family/tiramisu/base.py

@@ -12,10 +12,10 @@ try:
 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('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")}))}))
-option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), 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('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=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", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_7 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")}))}))
-option_6 = OptionDescription(name="general2", doc="Général2", children=[option_7], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_6 = OptionDescription(name="general2", doc="Général2", children=[option_7], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=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_mandatoryifin/tiramisu/base.py

@@ -12,8 +12,8 @@ try:
 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('mandatory'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")}))}))
-option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('mandatory'), 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('mandatory'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")}))}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py

@@ -12,8 +12,8 @@ try:
 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_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), 'expected': ParamValue("oui")}))}))
-option_5 = BoolOption(name="mode_conteneur_actif2", doc="No change", default=True, 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 = BoolOption(name="mode_conteneur_actif2", doc="No change", default=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")}))}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_10 = StrOption(name="engine", doc="engine", default="creole")
@@ -23,7 +23,7 @@ option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/etc/file")
 option_15 = StrOption(name="owner", doc="owner", default="root")
 option_16 = StrOption(name="source", doc="source", default="file")
-option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("oui")})))
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue("oui")})))
 option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
 option_18 = BoolOption(name="activate", doc="activate", default=True)

tests/dictionaries/11disabled_if_in_filelist_boolean/tiramisu/base.py

@@ -21,7 +21,7 @@ option_11 = StrOption(name="mode", doc="mode", default="0644")
 option_12 = FilenameOption(name="name", doc="name", default="/tmp/file1")
 option_13 = StrOption(name="owner", doc="owner", default="root")
 option_14 = StrOption(name="source", doc="source", default="file1")
-option_15 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(True)})))
+option_15 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue(True)})))
 option_7 = OptionDescription(name="file1", doc="file1", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
 option_6 = OptionDescription(name="files", doc="files", children=[option_7])
 option_16 = BoolOption(name="activate", doc="activate", default=True)

tests/dictionaries/11disabled_if_in_filelist_boolean2/tiramisu/base.py

@@ -21,7 +21,7 @@ option_11 = StrOption(name="mode", doc="mode", default="0644")
 option_12 = FilenameOption(name="name", doc="name", default="/tmp/file1")
 option_13 = StrOption(name="owner", doc="owner", default="root")
 option_14 = StrOption(name="source", doc="source", default="file1")
-option_15 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(True)})))
+option_15 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue(True)})))
 option_7 = OptionDescription(name="file1", doc="file1", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
 option_6 = OptionDescription(name="files", doc="files", children=[option_7])
 option_16 = BoolOption(name="activate", doc="activate", default=True)

tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py

@@ -12,8 +12,8 @@ try:
 except:
     from tiramisu import *
 option_3 = StrOption(name="condition", doc="No change", default="oui", 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_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), '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_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), 'expected': ParamValue("oui")}))}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_10 = StrOption(name="engine", doc="engine", default="creole")
@@ -23,7 +23,7 @@ option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/etc/file")
 option_15 = StrOption(name="owner", doc="owner", default="root")
 option_16 = StrOption(name="source", doc="source", default="file")
-option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("oui")})))
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue("oui")})))
 option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
 option_18 = BoolOption(name="activate", doc="activate", default=True)

tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py

@@ -12,8 +12,8 @@ try:
 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_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), '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_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), 'expected': ParamValue("oui")}))}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_10 = StrOption(name="engine", doc="engine", default="creole")
@@ -23,7 +23,7 @@ option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
 option_15 = StrOption(name="owner", doc="owner", default="root")
 option_16 = StrOption(name="source", doc="source", default="file1")
-option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("oui")})))
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue("oui")})))
 option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_19 = StrOption(name="engine", doc="engine", default="creole")
 option_20 = StrOption(name="group", doc="group", default="root")
@@ -32,7 +32,7 @@ option_22 = StrOption(name="mode", doc="mode", default="0644")
 option_23 = FilenameOption(name="name", doc="name", default="/tmp/file2")
 option_24 = StrOption(name="owner", doc="owner", default="root")
 option_25 = StrOption(name="source", doc="source", default="file2")
-option_26 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("oui")})))
+option_26 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue("oui")})))
 option_18 = OptionDescription(name="file2", doc="file2", children=[option_19, option_20, option_21, option_22, option_23, option_24, option_25, option_26])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9, option_18])
 option_27 = BoolOption(name="activate", doc="activate", default=True)

tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py

@@ -23,7 +23,7 @@ option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file")
 option_15 = StrOption(name="owner", doc="owner", default="root")
 option_16 = StrOption(name="source", doc="source", default="file")
-option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("unpossible"), 'reverse_condition_0': ParamValue(True)})))
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue("unpossible"), 'reverse_condition_0': ParamValue(True)})))
 option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
 option_18 = BoolOption(name="activate", doc="activate", default=True)

tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py

@@ -23,7 +23,7 @@ option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file")
 option_15 = StrOption(name="owner", doc="owner", default="root")
 option_16 = StrOption(name="source", doc="source", default="file")
-option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("unpossible"), 'reverse_condition_0': ParamValue(True)})))
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue("unpossible"), 'reverse_condition_0': ParamValue(True)})))
 option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
 option_18 = BoolOption(name="activate", doc="activate", default=True)

tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py

@@ -23,7 +23,7 @@ option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file")
 option_15 = StrOption(name="owner", doc="owner", default="root")
 option_16 = StrOption(name="source", doc="source", default="file")
-option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("unpossible"), 'reverse_condition_0': ParamValue(True), 'condition_1': ParamOption(option_5, notraisepropertyerror=True), 'expected_1': ParamValue("oui"), 'reverse_condition_1': ParamValue(True), 'condition_operator': ParamValue("OR")})))
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue("unpossible"), 'reverse_condition_0': ParamValue(True), 'condition_1': ParamOption(option_5), 'expected_1': ParamValue("oui"), 'reverse_condition_1': ParamValue(True), 'condition_operator': ParamValue("OR")})))
 option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
 option_18 = BoolOption(name="activate", doc="activate", default=True)

tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py

@@ -23,7 +23,7 @@ option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file")
 option_15 = StrOption(name="owner", doc="owner", default="root")
 option_16 = StrOption(name="source", doc="source", default="file")
-option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("statique"), 'reverse_condition_0': ParamValue(True)})))
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue("statique"), 'reverse_condition_0': ParamValue(True)})))
 option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
 option_18 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -12,7 +12,7 @@ try:
 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_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), '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"}))

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

@@ -15,8 +15,8 @@ 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_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_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), 'expected': ParamValue("non")})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_7, todict=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_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), '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/40condition_base/tiramisu/base.py

@@ -13,8 +13,8 @@ except:
     from tiramisu import *
 option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
 option_4 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_5 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_5 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue("oui")}))}))
-option_6 = 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_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_6 = 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_4, todict=True), 'expected': ParamValue("oui")}))}))
 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/40condition_base_add/tiramisu/base.py

@@ -13,8 +13,8 @@ except:
     from tiramisu import *
 option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
 option_4 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_5 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_5 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue("oui")}))}))
-option_6 = 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_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_6 = 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_4, todict=True), 'expected': ParamValue("oui")}))}))
 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/40condition_optional/tiramisu/base.py

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

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

@@ -13,6 +13,6 @@ except:
     from tiramisu import *
 option_2 = BoolOption(name="condition", doc="condition", default=True, properties=frozenset({"mandatory", "normal"}))
 option_4 = StrOption(name="my_variable", doc="my_variable", properties=frozenset({"normal"}))
-option_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
+option_3 = OptionDescription(name="general", doc="general", children=[option_4], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True), 'expected': ParamValue(True)}))}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

@@ -14,7 +14,7 @@ except:
 option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
 option_4 = StrOption(name="condition", doc="condition", default="oui", properties=frozenset({"mandatory", "normal"}))
 option_6 = StrOption(name="leader", doc="leader", multi=True)
-option_7 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_7 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue("oui")}))}))
 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({"normal"}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))

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

@@ -14,7 +14,7 @@ except:
 option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
 option_4 = StrOption(name="condition", doc="condition", default="oui", properties=frozenset({"mandatory", "normal"}))
 option_6 = StrOption(name="leader", doc="leader", multi=True, default=['a'], properties=frozenset({"mandatory"}))
-option_7 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_7 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue("oui")}))}))
 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({"normal"}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))

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

@@ -14,7 +14,7 @@ except:
 option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
 option_4 = StrOption(name="condition", doc="condition", default="oui", properties=frozenset({"mandatory", "normal"}))
 option_6 = StrOption(name="leader", doc="leader", multi=True, default=['a', 'b'], properties=frozenset({"mandatory"}))
-option_7 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue("a")}))}))
+option_7 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True), 'expected': ParamValue("a")}))}))
 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({"normal"}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))

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

@@ -14,7 +14,7 @@ except:
 option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
 option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
-option_6 = StrOption(name="mode_conteneur_actif3", 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")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_5, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_6 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue("oui")}))}))
 option_4 = OptionDescription(name="general2", doc="general2", children=[option_5, option_6], properties=frozenset({"hidden", "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/51redefine_family/tiramisu/base.py

@@ -14,6 +14,6 @@ except:
 option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
 option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
-option_4 = OptionDescription(name="general2", doc="general2", children=[option_5], properties=frozenset({"hidden", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
+option_4 = OptionDescription(name="general2", doc="general2", children=[option_5], properties=frozenset({"hidden", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue("oui")}))}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py

@@ -12,7 +12,7 @@ try:
 except:
     from tiramisu import *
 option_6 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
-option_2 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
+option_2 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
 option_3 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"}))
 option_4 = StrOption(name="my_var1", doc="my_var1", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
 option_5 = StrOption(name="my_var2", doc="my_var2", default="no", properties=frozenset({"mandatory", "normal"}))

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

@@ -12,7 +12,7 @@ try:
 except:
     from tiramisu import *
 option_5 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
-option_3 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_5, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))}))
+option_3 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
 option_4 = StrOption(name="my_var1", doc="my_var1", default="no", 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({"basic"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
@@ -22,6 +22,6 @@ option_10 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), defaul
 option_7 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_8, option_9, option_10], properties=frozenset({"normal"}))
 option_6 = OptionDescription(name="extra", doc="extra", children=[option_7])
 option_13 = StrOption(name="description", doc="description", default="test", properties=frozenset({"mandatory", "normal"}))
-option_12 = OptionDescription(name="external", doc="external", children=[option_13], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_8, todict=True, notraisepropertyerror=True), 'expected': ParamValue("non")}))}))
+option_12 = OptionDescription(name="external", doc="external", children=[option_13], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_8, todict=True), 'expected': ParamValue("non")}))}))
 option_11 = OptionDescription(name="extra1", doc="extra1", children=[option_12])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6, option_11])

tests/dictionaries/70service_servicelist/tiramisu/base.py

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 option_2 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_5 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2, notraisepropertyerror=True), 'expected_0': ParamValue("yes")})))
+option_5 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2), 'expected_0': ParamValue("yes")})))
 option_6 = BoolOption(name="manage", doc="manage", default=True)
 option_4 = OptionDescription(name="test", doc="test", children=[option_5, option_6])
 option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"}))

tests/dictionaries/70service_servicelist_disabled_if_in/00-base.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.9">
-
-    <services>
-        <service name='test' servicelist="test">
-        </service>
-    </services>
-    <variables>
-        <variable name="condition1">
-            <value>no</value>
-        </variable>
-        <variable name="condition2">
-            <value>no</value>
-        </variable>
-    </variables>
-    <constraints>
-        <condition name="disabled_if_in" source="condition1">
-            <param>no</param>
-            <target>condition2</target>
-        </condition>
-        <condition name="disabled_if_in" source="condition2">
-            <param>yes</param>
-            <target type="servicelist">test</target>
-        </condition>
-    </constraints>
-</rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/70service_servicelist_disabled_if_in/makedict/after.json

@@ -1,14 +0,0 @@
-{
-    "rougail.condition1": {
-        "owner": "default",
-        "value": "no"
-    },
-    "services.test.activate": {
-        "owner": "default",
-        "value": false
-    },
-    "services.test.manage": {
-        "owner": "default",
-        "value": true
-    }
-}

tests/dictionaries/70service_servicelist_disabled_if_in/makedict/base.json

@@ -1,5 +0,0 @@
-{
-    "rougail.condition1": "no",
-    "services.test.activate": false,
-    "services.test.manage": true
-}

tests/dictionaries/70service_servicelist_disabled_if_in/makedict/before.json

@@ -1,14 +0,0 @@
-{
-    "rougail.condition1": {
-        "owner": "default",
-        "value": "no"
-    },
-    "services.test.activate": {
-        "owner": "default",
-        "value": false
-    },
-    "services.test.manage": {
-        "owner": "default",
-        "value": true
-    }
-}

tests/dictionaries/70service_servicelist_disabled_if_in/tiramisu/base.py

@@ -1,21 +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="condition1", doc="condition1", default="no", properties=frozenset({"mandatory", "normal"}))
-option_3 = StrOption(name="condition2", doc="condition2", default="no", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("no")}))}))
-option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
-option_6 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("yes")})))
-option_7 = BoolOption(name="manage", doc="manage", default=True)
-option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_7])
-option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])

tests/dictionaries/70service_servicelist_file/tiramisu/base.py

@@ -24,7 +24,7 @@ option_14 = StrOption(name="source", doc="source", default="file")
 option_15 = BoolOption(name="activate", doc="activate", default=True)
 option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
 option_6 = OptionDescription(name="files", doc="files", children=[option_7])
-option_16 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2, notraisepropertyerror=True), 'expected_0': ParamValue("no")})))
+option_16 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2), 'expected_0': ParamValue("no")})))
 option_17 = BoolOption(name="manage", doc="manage", default=True)
 option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_16, option_17])
 option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))

tests/dictionaries/70service_servicelist_ip/tiramisu/base.py

@@ -18,7 +18,7 @@ option_8 = SymLinkOption(name="name", opt=option_3)
 option_9 = BoolOption(name="activate", doc="activate", default=True)
 option_7 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_8, option_9])
 option_6 = OptionDescription(name="ip", doc="ip", children=[option_7])
-option_10 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2, notraisepropertyerror=True), 'expected_0': ParamValue("no")})))
+option_10 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2), 'expected_0': ParamValue("no")})))
 option_11 = BoolOption(name="manage", doc="manage", default=True)
 option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_10, option_11])
 option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))

tests/dictionaries/70service_servicelist_not_managed/tiramisu/base.py

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 option_2 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_5 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2, notraisepropertyerror=True), 'expected_0': ParamValue("yes")})))
+option_5 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2), 'expected_0': ParamValue("yes")})))
 option_6 = BoolOption(name="manage", doc="manage", default=False)
 option_4 = OptionDescription(name="test", doc="test", children=[option_5, option_6])
 option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"}))

tests/dictionaries/70services_ip_iplist/tiramisu/base.py

@@ -12,10 +12,10 @@ try:
 except:
     from tiramisu import *
 option_2 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"}))
-option_3 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.0/24", cidr=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")}))}))
+option_3 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.0/24", cidr=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_2, todict=True), 'expected': ParamValue("yes")}))}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
 option_8 = SymLinkOption(name="name", opt=option_3)
-option_9 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2, notraisepropertyerror=True), 'expected_0': ParamValue("yes")})))
+option_9 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2), 'expected_0': ParamValue("yes")})))
 option_7 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_8, option_9])
 option_6 = OptionDescription(name="ip", doc="ip", children=[option_7])
 option_10 = BoolOption(name="activate", doc="activate", default=True)

tests/dictionaries/70services_ip_iplist2/tiramisu/base.py

@@ -15,7 +15,7 @@ option_2 = StrOption(name="condition", doc="condition", default="yes", propertie
 option_3 = NetworkOption(name="nut_monitor_host", doc="nut_monitor_host", default="192.168.0.0/24", cidr=True, properties=frozenset({"mandatory", "normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
 option_8 = SymLinkOption(name="name", opt=option_3)
-option_9 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2, notraisepropertyerror=True), 'expected_0': ParamValue("yes")})))
+option_9 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2), 'expected_0': ParamValue("yes")})))
 option_7 = OptionDescription(name="nut_monitor_host", doc="nut_monitor_host", children=[option_8, option_9])
 option_6 = OptionDescription(name="ip", doc="ip", children=[option_7])
 option_10 = BoolOption(name="activate", doc="activate", default=True)