simplify objectspace

src/rougail/annotator.py

@@ -166,7 +166,7 @@ class GroupAnnotator:
                                                               )
                     has_a_leader = True
             else:
-                raise DictConsistencyError(_('cannot found followers {}').format(follower_names))
+                raise DictConsistencyError(_('cannot found followers "{}"').format('", "'.join(follower_names)))
         del self.objectspace.space.constraints.group
 
     def manage_leader(self,
@@ -464,8 +464,7 @@ class ServiceAnnotator:
             if not hasattr(file_, 'source'):
                 file_.source = basename(file_.name)
         elif not hasattr(file_, 'source'):
-            raise DictConsistencyError(_('attribute source mandatory for file with variable name '
+            raise DictConsistencyError(_('attribute source mandatory for file with variable name for {}').format(file_.name))
-                                               'for {}').format(file_.name))
 
 
 class VariableAnnotator:
@@ -474,7 +473,6 @@ class VariableAnnotator:
                  ):
         self.objectspace = objectspace
         self.convert_variable()
-        self.convert_helps()
         self.convert_auto_freeze()
         self.convert_separators()
 
@@ -568,20 +566,6 @@ class VariableAnnotator:
                                                     )
                                 _valid_type(variable)
 
-    def convert_helps(self):
-        if not hasattr(self.objectspace.space, 'help'):
-            return
-        helps = self.objectspace.space.help
-        if hasattr(helps, 'variable'):
-            for hlp in helps.variable.values():
-                variable = self.objectspace.paths.get_variable_obj(hlp.name)
-                variable.help = hlp.text
-        if hasattr(helps, 'family'):
-            for hlp in helps.family.values():
-                variable = self.objectspace.paths.get_family_obj(hlp.name)
-                variable.help = hlp.text
-        del self.objectspace.space.help
-
     def convert_auto_freeze(self):  # pylint: disable=C0111
         def _convert_auto_freeze(variable, namespace):
             if variable.auto_freeze:
@@ -705,7 +689,9 @@ class ConstraintAnnotator:
         for idx, check in enumerate(self.objectspace.space.constraints.check):
             if check.name == 'valid_enum':
                 if check.target in self.valid_enums:
-                    raise DictConsistencyError(_(f'valid_enum already set for {check.target}'))
+                    old_xmlfiles = self.objectspace.display_xmlfiles(self.valid_enums[check.target]['xmlfiles'])
+                    xmlfiles = self.objectspace.display_xmlfiles(check.xmlfiles)
+                    raise DictConsistencyError(_(f'valid_enum define in {xmlfiles} but already set in {old_xmlfiles} for "{check.target}", did you forget remove_check?'))
                 if not hasattr(check, 'param'):
                     raise DictConsistencyError(_(f'param is mandatory for a valid_enum of variable {check.target}'))
                 variable = self.objectspace.paths.get_variable_obj(check.target)
@@ -716,7 +702,8 @@ class ConstraintAnnotator:
                 self._set_valid_enum(variable,
                                      values,
                                      variable.type,
-                                     check.target
+                                     check.target,
+                                     check.xmlfiles,
                                      )
                 remove_indexes.append(idx)
         remove_indexes.sort(reverse=True)
@@ -765,6 +752,7 @@ class ConstraintAnnotator:
         if target.type == 'variable':
             variable = self.objectspace.paths.get_variable_obj(target.name)
             family = self.objectspace.paths.get_family_obj(target.name.rsplit('.', 1)[0])
+            # it's a leader, so apply property to leadership
             if isinstance(family, self.objectspace.Leadership) and family.name == variable.name:
                 return family, family.variable
             return variable, [variable]
@@ -788,13 +776,15 @@ class ConstraintAnnotator:
                     if condition.source == target.name:
                         raise DictConsistencyError(_('target name and source name must be different: {}').format(condition.source))
                     try:
-                        target.name = self.objectspace.paths.get_variable_path(target.name, namespace)
+                        target_names = [normalize_family(name) for name in target.name.split('.')]
+                        target.name = self.objectspace.paths.get_variable_path('.'.join(target_names), namespace)
                     except DictConsistencyError:
                         # for optional variable
                         pass
                 elif target.type == 'family':
                     try:
-                        target.name = self.objectspace.paths.get_family_path(target.name, namespace)
+                        target_names = [normalize_family(name) for name in target.name.split('.')]
+                        target.name = self.objectspace.paths.get_family_path('.'.join(target_names), namespace)
                     except KeyError:
                         raise DictConsistencyError(_('cannot found family {}').format(target.name))
 
@@ -927,34 +917,41 @@ class ConstraintAnnotator:
             inverse = condition.name.endswith('_if_not_in')
             actions = self._get_condition_actions(condition.name)
             for param in condition.param:
-                if hasattr(param, 'text'):
+                text = getattr(param, 'text', None)
-                    param = param.text
-                else:
-                    param = None
                 for target in condition.target:
                     leader_or_variable, variables = self._get_family_variables_from_target(target)
                     # if option is already disable, do not apply disable_if_in
-                    if hasattr(leader_or_variable, actions[0]) and getattr(leader_or_variable, actions[0]) is True:
+                    # check only the first action (example of multiple actions: 'hidden', 'frozen', 'force_default_on_freeze')
+                    main_action = actions[0]
+                    if getattr(leader_or_variable, main_action, False) is True:
                         continue
                     for idx, action in enumerate(actions):
                         prop = self.objectspace.property_(leader_or_variable.xmlfiles)
                         prop.type = 'calculation'
                         prop.inverse = inverse
                         prop.source = condition.source
-                        prop.expected = param
+                        prop.expected = text
                         prop.name = action
                         if idx == 0:
+                            # main action is for the variable or family
                             if not hasattr(leader_or_variable, 'property'):
                                 leader_or_variable.property = []
                             leader_or_variable.property.append(prop)
                         else:
+                            # other actions are set to the variable or children of family
                             for variable in variables:
                                 if not hasattr(variable, 'property'):
                                     variable.property = []
                                 variable.property.append(prop)
         del self.objectspace.space.constraints.condition
 
-    def _set_valid_enum(self, variable, values, type_, target):
+    def _set_valid_enum(self,
+                        variable,
+                        values,
+                        type_,
+                        target: str,
+                        xmlfiles: List[str],
+                        ):
         # value for choice's variable is mandatory
         variable.mandatory = True
         # build choice
@@ -967,6 +964,7 @@ class ConstraintAnnotator:
         else:
             self.valid_enums[target] = {'type': type_,
                                         'values': values,
+                                        'xmlfiles': xmlfiles,
                                         }
             choices = []
             for value in values:
@@ -1061,8 +1059,9 @@ class ConstraintAnnotator:
         for idx in indexes:
             fill = fills[idx]
             # test if it's redefined calculation
-            if fill.target in targets and not fill.redefine:
+            if fill.target in targets:
-                raise DictConsistencyError(_(f"A fill already exists for the target: {fill.target}"))
+                xmlfiles = self.objectspace.display_xmlfiles(fill.xmlfiles)
+                raise DictConsistencyError(_(f'A fill already exists for the target of "{fill.target}" created in {xmlfiles}'))
             targets.append(fill.target)
             #
             if fill.name not in self.functions:

src/rougail/data/rougail.dtd

@@ -50,21 +50,21 @@
 <!ATTLIST service manage (True|False) "True">
 
 <!ELEMENT port (#PCDATA)>
-<!ATTLIST port port_type (PortOption|SymLinkOption|variable) "PortOption">
+<!ATTLIST port port_type (PortOption|variable) "PortOption">
 <!ATTLIST port portlist CDATA #IMPLIED >
 <!ATTLIST port protocol (tcp|udp) "tcp">
 
 <!ELEMENT ip (#PCDATA)>
 <!ATTLIST ip iplist CDATA #IMPLIED >
-<!ATTLIST ip ip_type (NetworkOption|SymLinkOption|variable) "NetworkOption">
+<!ATTLIST ip ip_type (NetworkOption|variable) "NetworkOption">
-<!ATTLIST ip interface_type (UnicodeOption|SymLinkOption|variable) "UnicodeOption">
+<!ATTLIST ip interface_type (UnicodeOption|variable) "UnicodeOption">
 <!ATTLIST ip interface CDATA #REQUIRED>
-<!ATTLIST ip netmask_type (NetmaskOption|SymLinkOption|variable) "NetmaskOption">
+<!ATTLIST ip netmask_type (NetmaskOption|variable) "NetmaskOption">
 <!ATTLIST ip netmask CDATA "255.255.255.255">
 
 <!ELEMENT file EMPTY>
 <!ATTLIST file name CDATA #REQUIRED >
-<!ATTLIST file file_type (UnicodeOption|SymLinkOption|variable) "UnicodeOption">
+<!ATTLIST file file_type (UnicodeOption|variable) "UnicodeOption">
 <!ATTLIST file variable CDATA #IMPLIED>
 <!ATTLIST file variable_type (variable) "variable">
 <!ATTLIST file source CDATA #IMPLIED>
@@ -80,17 +80,19 @@
 <!ATTLIST override templating (True|False) "True">
 
 <!ELEMENT variables (family*, separators*)>
-<!ELEMENT family (#PCDATA | variable)*>
+<!ELEMENT family (variable*)>
 <!ATTLIST family name CDATA #REQUIRED>
 <!ATTLIST family description CDATA #IMPLIED>
+<!ATTLIST family help CDATA #IMPLIED>
 <!ATTLIST family mode (basic|normal|expert) "basic">
 <!ATTLIST family hidden (True|False) "False">
 <!ATTLIST family dynamic CDATA #IMPLIED>
 
-<!ELEMENT variable (#PCDATA | value)*>
+<!ELEMENT variable (value*)>
 <!ATTLIST variable name CDATA #REQUIRED>
 <!ATTLIST variable type CDATA #IMPLIED>
 <!ATTLIST variable description CDATA #IMPLIED>
+<!ATTLIST variable help CDATA #IMPLIED>
 <!ATTLIST variable hidden (True|False) "False">
 <!ATTLIST variable disabled (True|False) "False">
 <!ATTLIST variable multi (True|False) "False">
@@ -145,5 +147,3 @@
 <!ATTLIST target optional (True|False) "False">
 
 <!ELEMENT follower (#PCDATA)>
-
-<!ELEMENT help ((variable* | family*)*)>

src/rougail/objspace.py

@@ -1,20 +1,25 @@
 """
-Creole flattener. Takes a bunch of Creole XML dispatched in differents folders
+Takes a bunch of Creole XML dispatched in differents folders
-as an input and outputs a human readable flatened XML
+as an input and outputs a Tiramisu's file
 
 Sample usage::
 
+        eolobj.space_visitor(func)
+    xml = eolobj.save()
+
+
+
     >>> from rougail.objspace import CreoleObjSpace
     >>> eolobj = CreoleObjSpace('/usr/share/rougail/rougail.dtd')
-    >>> eolobj.create_or_populate_from_xml('rougail', ['/usr/share/eole/rougail/dicos'])
+    >>> eolobj.create_or_populate_from_xml('rougail', ['/usr/share/rougail/dicos'])
-    >>> eolobj.space_visitor()
+    >>> eolobj.space_visitor('/usr/share/rougail/funcs.py')
-    >>> eolobj.save('/tmp/rougail_flatened_output.xml')
+    >>> tiramisu = eolobj.save()
 
 The CreoleObjSpace
 
 - loads the XML into an internal CreoleObjSpace representation
 - visits/annotates the objects
-- dumps the object space as XML output into a single XML target
+- dumps the object space as Tiramisu string
 
 The visit/annotation stage is a complex step that corresponds to the Creole
 procedures.
@@ -23,11 +28,9 @@ For example: a variable is redefined and shall be moved to another family
 means that a variable1 = Variable() object in the object space who lives in the family1 parent
 has to be moved in family2. The visit procedure changes the varable1's object space's parent.
 """
-from lxml.etree import Element, SubElement  # pylint: disable=E0611
-
 from .i18n import _
 from .xmlreflector import XMLReflector
-from .annotator import ERASED_ATTRIBUTES, SpaceAnnotator
+from .annotator import SpaceAnnotator
 from .tiramisureflector import TiramisuReflector
 from .utils import normalize_family
 from .error import OperationError, SpaceObjShallNotBeUpdated, DictConsistencyError
@@ -41,20 +44,8 @@ FORCE_UNREDEFINABLES = ('value',)
 # CreoleObjSpace's elements that shall be set to the UnRedefinable type
 UNREDEFINABLE = ('multi', 'type')
 
-CONVERT_PROPERTIES = {'auto_save': ['force_store_value'], 'auto_freeze': ['force_store_value', 'auto_freeze']}
-
-RENAME_ATTIBUTES = {'description': 'doc'}
-
 FORCED_TEXT_ELTS_AS_NAME = ('choice', 'property', 'value', 'target')
 
-CONVERT_EXPORT = {'Leadership': 'leader',
-                  'Variable': 'variable',
-                  'Value': 'value',
-                  'Property': 'property',
-                  'Choice': 'choice',
-                  'Param': 'param',
-                  'Check': 'check',
-                  }
 
 # _____________________________________________________________________________
 # special types definitions for the Object Space's internal representation
@@ -65,6 +56,18 @@ class RootCreoleObject:
         self.xmlfiles = xmlfiles
 
 
+class Atom(RootCreoleObject):
+    pass
+
+
+class Redefinable(RootCreoleObject):
+    pass
+
+
+class UnRedefinable(RootCreoleObject):
+    pass
+
+
 class CreoleObjSpace:
     """DOM XML reflexion free internal representation of a Creole Dictionary
     """
@@ -77,11 +80,6 @@ class CreoleObjSpace:
     an Object Space's atom object is present only once in the
     object space's tree
     """
-    Atom = type('Atom', (RootCreoleObject,), dict())
-    "A variable that can't be redefined"
-    Redefinable = type('Redefinable', (RootCreoleObject,), dict())
-    "A variable can be redefined"
-    UnRedefinable = type('UnRedefinable', (RootCreoleObject,), dict())
 
 
     def __init__(self, dtdfilename):  # pylint: disable=R0912
@@ -95,7 +93,6 @@ class CreoleObjSpace:
         self.xmlreflector = XMLReflector()
         self.xmlreflector.parse_dtd(dtdfilename)
         self.redefine_variables = None
-        self.fill_removed = None
         self.check_removed = None
         self.condition_removed = None
 
@@ -116,25 +113,25 @@ class CreoleObjSpace:
         for dtd_elt in self.xmlreflector.dtd.iterelements():
             attrs = {}
             if dtd_elt.name in FORCE_REDEFINABLES:
-                clstype = self.Redefinable
+                clstype = Redefinable
+            elif not dtd_elt.attributes() and dtd_elt.name not in FORCE_UNREDEFINABLES:
+                clstype = Atom
             else:
-                clstype = self.UnRedefinable
+                clstype = UnRedefinable
-            atomic = dtd_elt.name not in FORCE_UNREDEFINABLES and dtd_elt.name not in FORCE_REDEFINABLES
             forced_text_elt = dtd_elt.type == 'mixed'
             for dtd_attr in dtd_elt.iterattributes():
-                atomic = False
+                if set(dtd_attr.itervalues()) == {'True', 'False'}:
-                if set(dtd_attr.itervalues()) == set(['True', 'False']):
                     # it's a boolean
                     self.booleans_attributs.append(dtd_attr.name)
                 if dtd_attr.default_value:
                     # set default value for this attribute
                     default_value = dtd_attr.default_value
                     if dtd_attr.name in self.booleans_attributs:
-                        default_value = self.convert_boolean(dtd_attr.default_value)
+                        default_value = self.convert_boolean(default_value)
                     attrs[dtd_attr.name] = default_value
                 if dtd_attr.name == 'redefine':
                     # has a redefine attribute, so it's a Redefinable object
-                    clstype = self.Redefinable
+                    clstype = Redefinable
                 if dtd_attr.name == 'name' and forced_text_elt:
                     # child.text should be transform has a "name" attribute
                     self.forced_text_elts.add(dtd_elt.name)
@@ -142,22 +139,19 @@ class CreoleObjSpace:
 
             if forced_text_elt is True:
                 self.forced_text_elts_as_name.add(dtd_elt.name)
-            if atomic:
-                # has any attribute so it's an Atomic object
-                clstype = self.Atom
 
             # create ObjectSpace object
             setattr(self, dtd_elt.name, type(dtd_elt.name.capitalize(), (clstype,), attrs))
 
     def create_or_populate_from_xml(self,
                                     namespace,
-                                    xmlfolders):
+                                    xmlfolders,
+                                    ):
         """Parses a bunch of XML files
         populates the CreoleObjSpace
         """
         for xmlfile, document in self.xmlreflector.load_xml_from_folders(xmlfolders):
             self.redefine_variables = []
-            self.fill_removed = []
             self.check_removed = []
             self.condition_removed = []
             self.xml_parse_document(xmlfile,
@@ -175,43 +169,43 @@ class CreoleObjSpace:
         """Parses a Creole XML file
         populates the CreoleObjSpace
         """
+        # var to check unique family name in a XML file
         family_names = []
         for child in document:
             # this index enables us to reorder objects
-            self.index += 1
-            # doesn't proceed the XML commentaries
             if not isinstance(child.tag, str):
+                # doesn't proceed the XML commentaries
                 continue
             if child.tag == 'family':
                 if child.attrib['name'] in family_names:
                     raise DictConsistencyError(_(f'Family "{child.attrib["name"]}" is set several times in "{xmlfile}"'))
                 family_names.append(child.attrib['name'])
             if child.tag == 'variables':
+                # variables has no name, so force namespace name
                 child.attrib['name'] = namespace
-            if child.tag == 'value' and child.text == None:
+            if child.tag == 'value' and child.text is None:
-                # FIXME should not be here
                 continue
             # variable objects creation
             try:
-                variableobj = self.generate_variableobj(xmlfile,
+                variableobj = self.get_variableobj(xmlfile,
                                                    child,
                                                    space,
                                                    namespace,
                                                    )
             except SpaceObjShallNotBeUpdated:
                 continue
-            self.set_text_to_obj(child,
+            self.index += 1
+            self.set_text(child,
                           variableobj,
                           )
-            self.set_xml_attributes_to_obj(xmlfile,
+            self.set_attributes(xmlfile,
                                 child,
                                 variableobj,
                                 )
-            self.variableobj_tree_visitor(child,
+            self.remove(child,
                         variableobj,
-                                          namespace,
                         )
-            self.fill_variableobj_path_attribute(space,
+            self.set_path(space,
                           child,
                           namespace,
                           document,
@@ -220,6 +214,7 @@ class CreoleObjSpace:
             self.add_to_tree_structure(variableobj,
                                        space,
                                        child,
+                                       namespace,
                                        )
             if list(child) != []:
                 self.xml_parse_document(xmlfile,
@@ -228,34 +223,32 @@ class CreoleObjSpace:
                                         namespace,
                                         )
 
-    def generate_variableobj(self,
+    def get_variableobj(self,
-                             xmlfile,
+                        xmlfile: str,
-                             child,
+                        child: list,
                         space,
                         namespace,
                         ):
         """
         instanciates or creates Creole Object Subspace objects
         """
-        variableobj = getattr(self, child.tag)(xmlfile)
+        obj = getattr(self, child.tag)
-        if isinstance(variableobj, self.Redefinable):
+        if Redefinable in obj.__mro__:
-            variableobj = self.create_or_update_redefinable_object(xmlfile,
+            return self.create_or_update_redefinable_object(xmlfile,
                                                             child.attrib,
                                                             space,
                                                             child,
                                                             namespace,
                                                             )
-        elif isinstance(variableobj, self.Atom) and child.tag in vars(space):
+        elif Atom in obj.__mro__:
-            # instanciates an object from the CreoleObjSpace's builtins types
+            if child.tag in vars(space):
-            # example : child.tag = constraints -> a self.Constraints() object is created
+                # Atom instance has to be a singleton here
-            # this Atom instance has to be a singleton here
                 # we do not re-create it, we reuse it
-            variableobj = getattr(space, child.tag)
+                return getattr(space, child.tag)
-        self.create_tree_structure(space,
+            return obj(xmlfile)
-                                   child,
+        if child.tag not in vars(space):
-                                   variableobj,
+            setattr(space, child.tag, [])
-                                   )
+        return obj(xmlfile)
-        return variableobj
 
     def create_or_update_redefinable_object(self,
                                             xmlfile,
@@ -264,57 +257,38 @@ class CreoleObjSpace:
                                             child,
                                             namespace,
                                             ):
-        """Creates or retrieves the space object that corresponds
-        to the `child` XML object
-
-        Two attributes of the `child` XML object are important:
-
-        - with the `redefine` boolean flag attribute we know whether
-          the corresponding space object shall be created or updated
-
-            - `True` means that the corresponding space object shall be updated
-            - `False` means that the corresponding space object shall be created
-
-        - with the `exists` boolean flag attribute we know whether
-          the corresponding space object shall be created
-          (or nothing -- that is the space object isn't modified)
-
-            - `True` means that the corresponding space object shall be created
-            - `False` means that the corresponding space object is not updated
-
-        In the special case `redefine` is True and `exists` is False,
-        we create the corresponding space object if it doesn't exist
-        and we update it if it exists.
-
-        :return: the corresponding space object of the `child` XML object
-        """
         if child.tag in self.forced_text_elts_as_name:
             name = child.text
         else:
             name = subspace['name']
-        existed_var = self.is_already_exists(name,
+        if child.tag == 'family':
+            name = normalize_family(name)
+        existed_var = self.get_existed_obj(name,
                                            space,
                                            child,
                                            namespace,
                                            )
         if existed_var:
+            # if redefine is set to object, default value is False
+            # otherwise it's always a redefinable object
             default_redefine = child.tag in FORCE_REDEFINABLES
             redefine = self.convert_boolean(subspace.get('redefine', default_redefine))
-            exists = self.convert_boolean(subspace.get('exists', True))
             if redefine is True:
                 existed_var.xmlfiles.append(xmlfile)
-                return self.translate_in_space(name,
+                return existed_var
-                                               space,
+            exists = self.convert_boolean(subspace.get('exists', True))
-                                               child,
+            if exists is False:
-                                               namespace,
-                                               )
-            elif exists is False:
                 raise SpaceObjShallNotBeUpdated()
             xmlfiles = self.display_xmlfiles(existed_var.xmlfiles)
             raise DictConsistencyError(_(f'"{child.tag}" named "{name}" cannot be re-created in "{xmlfile}", already defined in {xmlfiles}'))
-        redefine = self.convert_boolean(subspace.get('redefine', False))
+        # if this object must only be modified if object already exists
         exists = self.convert_boolean(subspace.get('exists', False))
-        if redefine is False or exists is True:
+        if exists is True:
+            raise SpaceObjShallNotBeUpdated()
+        redefine = self.convert_boolean(subspace.get('redefine', False))
+        if redefine is False:
+            if child.tag not in vars(space):
+                setattr(space, child.tag, {})
             return getattr(self, child.tag)(xmlfile)
         raise DictConsistencyError(_(f'Redefined object in "{xmlfile}": "{name}" does not exist yet'))
 
@@ -323,35 +297,9 @@ class CreoleObjSpace:
                          ) -> str:
         if len(xmlfiles) == 1:
             return '"' + xmlfiles[0] + '"'
-        else:
         return '"' + '", "'.join(xmlfiles[:-1]) + '"' + ' and ' + '"' + xmlfiles[-1] + '"'
 
-    def create_tree_structure(self,
+    def get_existed_obj(self,
-                              space,
-                              child,
-                              variableobj,
-                              ):  # pylint: disable=R0201
-        """
-        Builds the tree structure of the object space here
-        we set services attributes in order to be populated later on
-        for example::
-
-            space = Family()
-            space.variable = dict()
-            another example:
-            space = Variable()
-            space.value = list()
-        """
-        if child.tag not in vars(space):
-            if isinstance(variableobj, self.Redefinable):
-                setattr(space, child.tag, dict())
-            elif isinstance(variableobj, self.UnRedefinable):
-                setattr(space, child.tag, [])
-            elif not isinstance(variableobj, self.Atom):  # pragma: no cover
-                raise OperationError(_("Creole object {} "
-                                             "has a wrong type").format(type(variableobj)))
-
-    def is_already_exists(self,
                         name: str,
                         space: str,
                         child,
@@ -361,15 +309,17 @@ class CreoleObjSpace:
             if namespace != Config['variable_namespace']:
                 name = space.path + '.' + name
             if self.paths.path_is_defined(name):
+                old_family_name = self.paths.get_variable_family_name(name)
+                if namespace != Config['variable_namespace']:
+                    old_family_name = namespace + '.' + old_family_name
+                if space.path != old_family_name:
+                    xmlfiles = self.display_xmlfiles(space.xmlfiles)
+                    raise DictConsistencyError(_(f'Variable was previously create in family "{old_family_name}", now it is in "{space.path}" in {xmlfiles}'))
                 return self.paths.get_variable_obj(name)
             return
-        if child.tag == 'family':
-            norm_name = normalize_family(name)
-        else:
-            norm_name = name
         children = getattr(space, child.tag, {})
-        if norm_name in children:
+        if name in children:
-            return children[norm_name]
+            return children[name]
 
     def convert_boolean(self, value):  # pylint: disable=R0201
         """Boolean coercion. The Creole XML may contain srings like `True` or `False`
@@ -380,53 +330,59 @@ class CreoleObjSpace:
             return True
         elif value == 'False':
             return False
-        else:
         raise TypeError(_('{} is not True or False').format(value))  # pragma: no cover
 
-    def translate_in_space(self,
+    def set_text(self,
-                           name,
+                 child,
-                           family,
+                 variableobj,
-                           variable,
-                           namespace,
                  ):
-        if not isinstance(family, self.family):  # pylint: disable=E1101
+        if child.text is None:
-            if variable.tag == 'family':
+            return
-                norm_name = normalize_family(name)
+        text = child.text.strip()
+        if not text:
+            return
+        if child.tag in self.forced_text_elts_as_name:
+            variableobj.name = text
         else:
-                norm_name = name
+            variableobj.text = text
-            return getattr(family, variable.tag)[norm_name]
-        if namespace == Config['variable_namespace']:
-            path = name
-        else:
-            path = family.path + '.' + name
-        old_family_name = self.paths.get_variable_family_name(path)
-        if normalize_family(family.name) == old_family_name:
-            return getattr(family, variable.tag)[name]
-        old_family = self.space.variables[Config['variable_namespace']].family[old_family_name]  # pylint: disable=E1101
-        variable_obj = old_family.variable[name]
-        del old_family.variable[name]
-        if 'variable' not in vars(family):
-            family.variable = dict()
-        family.variable[name] = variable_obj
-        self.paths.add_variable(namespace,
-                                name,
-                                family.name,
-                                False,
-                                variable_obj,
-                                )
-        return variable_obj
 
-    def remove_fill(self, name):  # pylint: disable=C0111
+    def set_attributes(self,
-        if hasattr(self.space, 'constraints') and hasattr(self.space.constraints, 'fill'):
+                       xmlfile,
-            remove_fills= []
+                       child,
-            for idx, fill in enumerate(self.space.constraints.fill):  # pylint: disable=E1101
+                       variableobj,
-                if hasattr(fill, 'target') and fill.target == name:
+                       ):
-                    remove_fills.append(idx)
+        redefine = self.convert_boolean(child.attrib.get('redefine', False))
+        if redefine and child.tag == 'variable':
+            # delete old values
+            has_value = hasattr(variableobj, 'value')
+            if has_value and len(child) != 0:
+                del variableobj.value
+        for attr, val in child.attrib.items():
+            if redefine and attr in UNREDEFINABLE:
+                xmlfiles = self.display_xmlfiles(variableobj.xmlfiles[:-1])
+                raise DictConsistencyError(_(f'cannot redefine attribute "{attr}" for variable "{child.attrib["name"]}" in "{xmlfile}", already defined in {xmlfiles}'))
+            if attr in self.booleans_attributs:
+                val = self.convert_boolean(val)
+            if attr == 'name' and getattr(variableobj, 'name', None):
+                # do not redefine name
+                continue
+            setattr(variableobj, attr, val)
 
-            remove_fills = list(set(remove_fills))
+    def remove(self,
-            remove_fills.sort(reverse=True)
+               child,
-            for idx in remove_fills:
+               variableobj,
-                self.space.constraints.fill.pop(idx)  # pylint: disable=E1101
+               ):
+        """Creole object tree manipulations
+        """
+        if child.tag == 'variable':
+            if child.attrib.get('remove_check', False):
+                self.remove_check(variableobj.name)
+            if child.attrib.get('remove_condition', False):
+                self.remove_condition(variableobj.name)
+            if child.attrib.get('remove_fill', False):
+                self.remove_fill(variableobj.name)
+        if child.tag == 'fill' and child.attrib['target'] in self.redefine_variables:
+            self.remove_fill(child.attrib['target'])
 
     def remove_check(self, name):  # pylint: disable=C0111
         if hasattr(self.space, 'constraints') and hasattr(self.space.constraints, 'check'):
@@ -441,100 +397,26 @@ class CreoleObjSpace:
                 self.space.constraints.check.pop(idx)  # pylint: disable=E1101
 
     def remove_condition(self, name):  # pylint: disable=C0111
+        remove_conditions = []
         for idx, condition in enumerate(self.space.constraints.condition):  # pylint: disable=E1101
-            remove_targets = []
+            if condition.source == name:
-            if hasattr(condition, 'target'):
+                remove_conditions.append(idx)
-                for target_idx, target in enumerate(condition.target):
+        for idx in remove_conditions:
-                    if target.name == name:
+            del self.space.constraints.condition[idx]
-                        remove_targets.append(target_idx)
-            remove_targets = list(set(remove_targets))
-            remove_targets.sort(reverse=True)
-            for idx in remove_targets:
-                del condition.target[idx]
 
-    def add_to_tree_structure(self,
+    def remove_fill(self, name):  # pylint: disable=C0111
-                              variableobj,
+        if hasattr(self.space, 'constraints') and hasattr(self.space.constraints, 'fill'):
-                              space,
+            remove_fills= []
-                              child,
+            for idx, fill in enumerate(self.space.constraints.fill):  # pylint: disable=E1101
-                              ):  # pylint: disable=R0201
+                if hasattr(fill, 'target') and fill.target == name:
-        if isinstance(variableobj, self.Redefinable):
+                    remove_fills.append(idx)
-            name = variableobj.name
-            if child.tag == 'family':
-                name = normalize_family(name)
-            getattr(space, child.tag)[name] = variableobj
-        elif isinstance(variableobj, self.UnRedefinable):
-            getattr(space, child.tag).append(variableobj)
-        else:
-            setattr(space, child.tag, variableobj)
 
-    def set_text_to_obj(self,
+            remove_fills = list(set(remove_fills))
-                        child,
+            remove_fills.sort(reverse=True)
-                        variableobj,
+            for idx in remove_fills:
-                        ):
+                self.space.constraints.fill.pop(idx)  # pylint: disable=E1101
-        if child.text is None:
-            text = None
-        else:
-            text = child.text.strip()
-        if text:
-            if child.tag in self.forced_text_elts_as_name:
-                variableobj.name = text
-            else:
-                variableobj.text = text
 
-    def set_xml_attributes_to_obj(self,
+    def set_path(self,
-                                  xmlfile,
-                                  child,
-                                  variableobj,
-                                  ):
-        redefine = self.convert_boolean(child.attrib.get('redefine', False))
-        has_value = hasattr(variableobj, 'value')
-        if redefine is True and child.tag == 'variable' and has_value and len(child) != 0:
-            del variableobj.value
-        for attr, val in child.attrib.items():
-            if redefine and attr in UNREDEFINABLE:
-                # UNREDEFINABLE concerns only 'variable' node so we can fix name
-                # to child.attrib['name']
-                name = child.attrib['name']
-                xmlfiles = self.display_xmlfiles(variableobj.xmlfiles[:-1])
-                raise DictConsistencyError(_(f'cannot redefine attribute "{attr}" for variable "{name}" in "{xmlfile}", already defined in {xmlfiles}'))
-            if attr in self.booleans_attributs:
-                val = self.convert_boolean(val)
-            if not (attr == 'name' and getattr(variableobj, 'name', None) != None):
-                setattr(variableobj, attr, val)
-        keys = list(vars(variableobj).keys())
-
-    def variableobj_tree_visitor(self,
-                                 child,
-                                 variableobj,
-                                 namespace,
-                                 ):
-        """Creole object tree manipulations
-        """
-        if child.tag == 'variable':
-            if child.attrib.get('remove_check', False):
-                self.remove_check(variableobj.name)
-            if child.attrib.get('remove_condition', False):
-                self.remove_condition(variableobj.name)
-            if child.attrib.get('remove_fill', False):
-                self.remove_fill(variableobj.name)
-        if child.tag == 'fill':
-            # if variable is a redefine in current dictionary
-            # XXX not working with variable not in variable and in leader/followers
-            variableobj.redefine = child.attrib['target'] in self.redefine_variables
-            if child.attrib['target'] in self.redefine_variables and child.attrib['target'] not in self.fill_removed:
-                self.remove_fill(child.attrib['target'])
-                self.fill_removed.append(child.attrib['target'])
-        if not hasattr(variableobj, 'index'):
-            variableobj.index = self.index
-        if child.tag == 'check' and child.attrib['target'] in self.redefine_variables and child.attrib['target'] not in self.check_removed:
-            self.remove_check(child.attrib['target'])
-            self.check_removed.append(child.attrib['target'])
-        if child.tag == 'condition' and child.attrib['source'] in self.redefine_variables and child.attrib['source'] not in self.condition_removed:
-            self.remove_condition(child.attrib['source'])
-            self.condition_removed.append(child.attrib['source'])
-        variableobj.namespace = namespace
-
-    def fill_variableobj_path_attribute(self,
                  space,
                  child,
                  namespace,
@@ -543,15 +425,15 @@ class CreoleObjSpace:
                  ):  # pylint: disable=R0913
         """Fill self.paths attributes
         """
-        if isinstance(space, self.help):  # pylint: disable=E1101
-            return
         if child.tag == 'variable':
-            family_name = normalize_family(document.attrib['name'])
+            family_name = document.attrib['name']
+            family_name = normalize_family(family_name)
             self.paths.add_variable(namespace,
                                     child.attrib['name'],
                                     family_name,
                                     document.attrib.get('dynamic') != None,
-                                    variableobj)
+                                    variableobj,
+                                    )
             if child.attrib.get('redefine', 'False') == 'True':
                 if namespace == Config['variable_namespace']:
                     self.redefine_variables.append(child.attrib['name'])
@@ -569,6 +451,25 @@ class CreoleObjSpace:
                                   )
             variableobj.path = self.paths.get_family_path(family_name, namespace)
 
+    def add_to_tree_structure(self,
+                              variableobj,
+                              space,
+                              child,
+                              namespace,
+                              ):  # pylint: disable=R0201
+        if not hasattr(variableobj, 'index'):
+            variableobj.index = self.index
+        variableobj.namespace = namespace
+        if isinstance(variableobj, Redefinable):
+            name = variableobj.name
+            if child.tag == 'family':
+                name = normalize_family(name)
+            getattr(space, child.tag)[name] = variableobj
+        elif isinstance(variableobj, UnRedefinable):
+            getattr(space, child.tag).append(variableobj)
+        else:
+            setattr(space, child.tag, variableobj)
+
     def space_visitor(self, eosfunc_file):  # pylint: disable=C0111
         self.funcs_path = eosfunc_file
         SpaceAnnotator(self, eosfunc_file)

src/rougail/path.py

@@ -38,10 +38,7 @@ class Path:
                         name: str,
                         current_namespace: str,
                         ) -> str:  # pylint: disable=C0111
-        name = normalize_family(name,
+        #name = normalize_family(name)
-                                check_name=False,
-                                allow_dot=True,
-                                )
         if '.' not in name and current_namespace == Config['variable_namespace'] and name in self.full_paths_families:
             name = self.full_paths_families[name]
         if current_namespace is None:  # pragma: no cover

src/rougail/tiramisu.py

@@ -9,5 +9,4 @@ class ConvertDynOptionDescription(DynOptionDescription):
     def convert_suffix_to_path(self, suffix):
         if not isinstance(suffix, str):
             suffix = str(suffix)
-        return normalize_family(suffix,
+        return normalize_family(suffix)
-                                check_name=False)

src/rougail/utils.py

@@ -1,23 +1,19 @@
 """
 utilitaires créole
 """
-import unicodedata
+from unicodedata import normalize, combining
 from .i18n import _
 
 
-def normalize_family(family_name: str,
+def valid_name(name: str) -> None:
-                     check_name: bool=True,
+    if '.' in name:
-                     allow_dot: bool=False) -> str:
+        raise ValueError(_(f'"{name}" is a forbidden variable or family name, dot is not allowed'))
+
+
+def normalize_family(family_name: str) -> str:
     """replace space, accent, uppercase, ... by valid character
     """
-    family_name = family_name.replace('-', '_')
+    family_name = family_name.replace('-', '_').replace(' ', '_').replace('.', '_')
-    if not allow_dot:
+    nfkd_form = normalize('NFKD', family_name)
-        family_name = family_name.replace('.', '_')
+    family_name = ''.join([c for c in nfkd_form if not combining(c)])
-    family_name = family_name.replace(' ', '_')
+    return family_name.lower()
-    nfkd_form = unicodedata.normalize('NFKD', family_name)
-    family_name = ''.join([c for c in nfkd_form if not unicodedata.combining(c)])
-    family_name = family_name.lower()
-    if check_name and family_name == 'containers':
-        raise ValueError(_(f'"{family_name}" is a forbidden family name'))
-    return family_name
-

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

@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_freeze="True">
@@ -10,14 +9,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_freeze="True" mode="expert">
@@ -12,14 +9,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_save="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_save="True" mode="expert">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <!-- this is a comment -->
@@ -10,14 +7,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -12,14 +9,7 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,23 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <rougail>
-
-    <services/>
-
     <variables>
         <family name='général'>
             <variable name='mode_conteneur_actif1' type='oui/non' description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -12,7 +9,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -20,9 +16,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -12,16 +9,12 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
         <fill name="calc_val" target="mode_conteneur_actif">
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="Redefine description" hidden="True" multi="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_freeze="True">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -23,9 +19,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" auto_save="True">
@@ -12,7 +9,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -20,9 +16,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change"/>
@@ -10,7 +7,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -18,9 +14,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="Général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -12,7 +9,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -20,9 +16,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general" mode="basic">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" mandatory="True" mode="expert"/>
@@ -10,7 +7,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -18,9 +14,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="number" description="No change" hidden="True"/>
@@ -10,7 +7,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -18,9 +14,6 @@
             <param type="number">3</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -12,7 +9,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -22,9 +18,6 @@
             <param type="variable" optional="True">mode_conteneur_actif3</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -13,12 +10,6 @@
             <separator name="mode_conteneur_actif">Établissement</separator>
         </separators>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -13,12 +10,6 @@
             <separator name="mode_conteneur_actif">Établissement</separator>
         </separators>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -10,18 +7,13 @@
             </variable>
             <variable name="autosavevar" type="string" description="autosave variable" hidden="True" auto_save="True"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
         <fill name="calc_val" target="autosavevar">
             <param>oui</param>
         </fill>
-
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -10,7 +7,6 @@
             </variable>
             <variable name="autosavevar" type="string" description="autosave variable" auto_save="True"/>
         </family>
-        <separators/>
     </variables>
     <constraints>
         <fill name="calc_val" target="autosavevar">
@@ -20,11 +16,7 @@
              <param>oui</param>
              <target type="variable">autosavevar</target>
         </condition>
-
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change">
@@ -10,7 +7,6 @@
             </variable>
             <variable name="int" type="number" description="No change"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -19,9 +15,6 @@
             <param name="maxi">100</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change">
@@ -10,15 +7,11 @@
             </variable>
             <variable name="int" type="number" description="No change"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
         <check name="valid_lower" target="int"/>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change">
@@ -13,7 +10,6 @@
             </variable>
             <variable name="int" type="number" description="No change"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -22,9 +18,6 @@
             <param name="maxi" type="variable">int2</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change">
@@ -11,7 +8,6 @@
             <variable name="int" type="number" description="No change"/>
             <variable name="int2" type="number" description="No change"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -21,11 +17,7 @@
         <check name="valid_differ" target="int">
             <param type="variable" optional="True">int3</param>
         </check>
-
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -12,7 +9,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -20,9 +16,6 @@
             <param type="variable">mode_conteneur_actif1</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -18,20 +15,13 @@
                 <value>oui</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
         <check name="valid_differ" target="mode_conteneur_actif3">
             <param type="variable">mode_conteneur_actif1</param>
         </check>
-        <check name="valid_differ" target="mode_conteneur_actif3">
-            <param type="variable">mode_conteneur_actif2</param>
-        </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/10check_valid_differ_add/01-base.xml

@@ -1,13 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif3" redefine="True">
+            <variable name="mode_conteneur_actif3" redefine="True"/>
-                <value>oui</value>
-            </variable>
         </family>
         <separators/>
     </variables>
@@ -20,9 +15,6 @@
             <param type="variable">mode_conteneur_actif2</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

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

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -18,20 +15,13 @@
                 <value>oui</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
         <check name="valid_differ" target="mode_conteneur_actif3">
             <param type="variable">mode_conteneur_actif1</param>
         </check>
-        <check name="valid_differ" target="mode_conteneur_actif3">
-            <param type="variable">mode_conteneur_actif2</param>
-        </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,15 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif3" redefine="True">
+            <variable name="mode_conteneur_actif3" redefine="True" remove_check="True">
                 <value>oui</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -20,9 +16,6 @@
             <param type="variable">mode_conteneur_actif2</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -12,7 +9,6 @@
             <variable name="adresse_netmask_eth0" type="netmask" description="Masque de sous réseau de la carte" mandatory="True" mode="basic"/>
             <variable name="adresse_ip" type="local_ip" description="IP" mandatory="True" mode="basic"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -21,9 +17,6 @@
             <param type="variable">adresse_netmask_eth0</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -11,7 +8,6 @@
             <variable name="adresse_ip_eth0" type="cidr" description="Adresse IP de la carte" mandatory="True" mode="basic"/>
             <variable name="adresse_ip" type="local_ip" description="IP" mandatory="True" mode="basic"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -19,9 +15,6 @@
             <param type="variable">adresse_ip_eth0</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -11,7 +8,6 @@
             <variable name="adresse_ip_eth0" type="local_ip" description="Adresse IP de la carte" mandatory="True" mode="basic"/>
             <variable name="adresse_netmask_eth0" type="netmask" description="Masque de sous réseau de la carte" mandatory="True" mode="basic"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -19,9 +15,6 @@
             <param type="variable">adresse_ip_eth0</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -28,7 +25,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general1">
             <variable name="follower3" type="string" description="follower3"/>
@@ -14,7 +11,4 @@
             <follower>follower3</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -31,7 +28,4 @@
             <follower>follower3</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -26,7 +23,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general" mode="expert">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -25,7 +22,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -26,7 +23,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="Général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -26,7 +23,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general" mode="expert">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -25,7 +22,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general" mode="expert">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -26,7 +23,4 @@
             <target type="variable">leader</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -26,7 +23,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -26,7 +23,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>

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

@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
     <variables>
         <family name="général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
@@ -9,7 +8,6 @@
 			<variable name="nut_monitor_netmask" type="netmask" description="Masque de l'IP du réseau de l'esclave" multi="True"/>
             <variable name="nut_monitor_host" type="network" description="Adresse IP du réseau de l'esclave" mandatory="True"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -17,9 +15,6 @@
             <follower>nut_monitor_host</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -35,7 +32,4 @@
             <follower>follower21</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="oui/non" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -26,9 +22,6 @@
             <target type="filelist">afilllist</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="string" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -26,9 +22,6 @@
             <target type="filelist">afilllist</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="Général">
             <variable name="condition" type="oui/non" description="No change">
@@ -20,7 +17,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -31,9 +27,6 @@
             <target type="family">Général2</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="oui/non" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -30,9 +26,6 @@
             <target type="variable">mode_conteneur_actif</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="oui/non" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -30,9 +26,6 @@
             <target type="variable">mode_conteneur_actif</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="oui/non" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -30,9 +26,6 @@
             <target type="variable">mode_conteneur_actif</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="oui/non" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -30,9 +26,6 @@
             <target type="variable">mode_conteneur_actif</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="oui/non" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -26,9 +22,6 @@
             <target type="filelist">afilllist</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change">
@@ -12,14 +9,7 @@
                 <value/>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="oui/non" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -25,9 +21,6 @@
             <target type="variable">mode_conteneur_actif2</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="oui/non" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -28,9 +24,6 @@
             <param>non</param>
         </fill>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="string" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -31,9 +27,6 @@
             <target type="variable">mode_conteneur_actif2</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="Général">
             <variable name="condition" type="oui/non" description="No change">
@@ -20,7 +17,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -31,9 +27,6 @@
             <target type="family">Général2</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -28,7 +25,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
           <variable name="mode_conteneur_actif" type="oui/non" description="leader" multi="True">
@@ -22,7 +19,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
           <variable name="mode_conteneur_actif" type="oui/non" description="leader" multi="True">
@@ -27,7 +24,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
           <variable name="mode_conteneur_actif" type="oui/non" description="leader" multi="True">
@@ -22,7 +19,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -15,14 +12,10 @@
             <variable name="follower2" type="string" description="follower2"/>
         </family>
     </variables>
-
     <constraints>
         <group leader="leader">
             <follower>follower1</follower>
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>

tests/dictionaries/10load_leadership_normalize_family/01-base.xml

@@ -1,17 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general-1">
             <variable name="leader" redefine="True" mandatory="True"/>
         </family>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -28,7 +25,4 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="oui/non" description="No change">
@@ -15,7 +12,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -25,9 +21,6 @@
             <target type="variable">mode_conteneur_actif2</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True" multi="True">
@@ -10,14 +7,7 @@
                 <value>oui</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general" mode="expert">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -10,11 +7,10 @@
             </variable>
         </family>
         <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="multi">
+            <variable name="enumvar" type="string" description="multi" help="bla bla bla">
                 <value>c</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -25,11 +21,6 @@
             <param>é</param>
         </check>
     </constraints>
-
-    <help>
-        <variable name="enumvar">bla bla bla</variable>
-    </help>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general" mode="expert">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -10,7 +7,7 @@
             </variable>
         </family>
         <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="multi">
+            <variable name="enumvar" type="string" description="multi" help="bla bla bla">
                 <value>c</value>
             </variable>
         </family>
@@ -24,11 +21,6 @@
             <param>c</param>
         </check>
     </constraints>
-
-    <help>
-        <variable name="enumvar">bla bla bla</variable>
-    </help>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general" mode="expert">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -13,11 +10,10 @@
             <variable name="enumvar2" type="string" description="multi">
                 <value>c</value>
             </variable>
-            <variable name="enumvar" type="string" description="multi">
+            <variable name="enumvar" type="string" description="multi" help="bla bla bla">
                 <value>c</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -32,11 +28,6 @@
             <param>c</param>
         </check>
     </constraints>
-
-    <help>
-        <variable name="enumvar">bla bla bla</variable>
-    </help>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/10valid_enum_base_redefine/01-base.xml

@@ -1,15 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="enumfam" mode="expert">
-            <variable name="enumvar" redefine="True">
+            <variable name="enumvar" redefine="True" remove_check="True">
                 <value>c</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -18,10 +14,6 @@
             <param>c</param>
         </check>
     </constraints>
-
-    <help>
-    </help>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -12,7 +9,6 @@
             <variable name="follower1" type="string" description="follower1"/>
             <variable name="follower2" type="string" description="follower2"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -26,9 +22,6 @@
             <follower>follower2</follower>
         </group>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -10,7 +7,6 @@
             </variable>
             <variable name="multi" type="string" description="multi" multi="True"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -20,9 +16,6 @@
             <param>c</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general" mode="expert">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -10,7 +7,7 @@
             </variable>
         </family>
         <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="string" description="multi">
+            <variable name="enumvar" type="string" description="multi" help="bla bla bla">
                 <value>b</value>
             </variable>
         </family>
@@ -24,11 +21,6 @@
             <param/>
         </check>
     </constraints>
-
-    <help>
-        <variable name="enumvar">bla bla bla</variable>
-    </help>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general" mode="expert">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -10,9 +7,8 @@
             </variable>
         </family>
         <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="number" description="enumvar"/>
+            <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -23,10 +19,6 @@
         </check>
     </constraints>
 
-    <help>
-        <variable name="enumvar">bla bla bla</variable>
-    </help>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general" mode="expert">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -10,11 +7,10 @@
             </variable>
         </family>
         <family name="enumfam" mode="expert">
-            <variable name="enumvar" type="number" description="enumvar">
+            <variable name="enumvar" type="number" description="enumvar" help="bla bla bla">
                 <value>3</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -24,11 +20,6 @@
             <param>3</param>
         </check>
     </constraints>
-
-    <help>
-        <variable name="enumvar">bla bla bla</variable>
-    </help>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

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

@@ -1,15 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change">
                 <value>b</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -19,9 +15,6 @@
             <param>c</param>
         </check>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/11disabled_if_in_filelist/00-base.xml

@@ -17,7 +17,6 @@
             </variable>
             <variable name="mode_conteneur_actif2" type="boolean" description="No change"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -28,9 +27,6 @@
             <target type="filelist">afilllist</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/11disabled_if_in_filelist_disabled/00-base.xml

@@ -19,7 +19,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -30,9 +29,6 @@
             <target type="filelist">afilllist</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/11disabled_if_in_filelist_multi/00-base.xml

@@ -20,7 +20,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -31,9 +30,6 @@
             <target type="filelist">afilllist</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/11disabledifin_filelist_notexist/00-base.xml

@@ -19,7 +19,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -28,9 +27,6 @@
             <target type="filelist">afilllist</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/11disabledifnotin_filelist_notexist/00-base.xml

@@ -6,8 +6,6 @@
             <file name="/tmp/file" filelist="afilllist"/>
         </service>
     </services>
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="condition" type="oui/non" description="No change">
@@ -20,7 +18,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -29,9 +26,6 @@
             <target type="filelist">afilllist</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/11disabledifnotin_filelist_notexist_multi/00-base.xml

@@ -19,7 +19,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -32,9 +31,6 @@
             <target type="filelist">afilllist</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/11multi_disabled_if_in_filelist/00-base.xml

@@ -16,7 +16,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -29,9 +28,6 @@
             <target type="filelist">afilllist</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/20family_append/00-base.xml

@@ -1,22 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/20family_append/01-base.xml

@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif1" type="oui/non" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>

tests/dictionaries/20family_appendaccent/00-base.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="Général">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -14,7 +11,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
@@ -23,9 +19,6 @@
             <target type="variable">mode_conteneur_actif</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/20family_appendaccent/01-base.xml

@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="Général">
             <variable name="mode_conteneur_actif1" type="oui/non" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>

tests/dictionaries/20family_appendaccent/02-base.xml

@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif2" type="oui/non" description="No change" hidden="True">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>

tests/dictionaries/20family_empty/00-base.xml

@@ -1,25 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change" mode="basic">
                 <value>non</value>
             </variable>
         </family>
-        <family name="general2"/>
+        <family name="general2" help="family"/>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help>
-        <family name="general2">family</family>
-    </help>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->