suppress separators

src/rougail/annotator/variable.py

@@ -51,10 +51,10 @@ class VariableAnnotator:
     def __init__(self,
                  objectspace,
                  ):
+        if not hasattr(objectspace.space, 'variables'):
+            return
         self.objectspace = objectspace
-        if hasattr(self.objectspace.space, 'variables'):
+        self.convert_variable()
-            self.convert_variable()
-            self.convert_separators()
 
     def _convert_variable(self,
                           namespace: str,
@@ -140,17 +140,3 @@ class VariableAnnotator:
                                                variable,
                                                'variable',
                                                )
-
-    def convert_separators(self):  # pylint: disable=C0111,R0201
-        for family in self.objectspace.space.variables.values():
-            if not hasattr(family, 'separators'):
-                continue
-            if hasattr(family.separators, 'separator'):
-                for separator in family.separators.separator:
-                    option = self.objectspace.paths.get_variable(separator.name)
-                    if hasattr(option, 'separator'):
-                        xmlfiles = self.objectspace.display_xmlfiles(separator.xmlfiles)
-                        msg = _(f'{separator.name} already has a separator in {xmlfiles}')
-                        raise DictConsistencyError(msg, 35)
-                    option.separator = separator.text
-            del family.separators

src/rougail/data/rougail.dtd

@@ -79,7 +79,7 @@
 <!ATTLIST override source CDATA #IMPLIED >
 <!ATTLIST override templating (True|False) "True">
 
-<!ELEMENT variables (family*, separators*)>
+<!ELEMENT variables (family*)>
 <!ELEMENT family (variable*)>
 <!ATTLIST family name CDATA #REQUIRED>
 <!ATTLIST family description CDATA #IMPLIED>
@@ -107,11 +107,6 @@
 <!ATTLIST variable remove_fill (True|False) "False">
 <!ATTLIST variable test CDATA #IMPLIED>
 
-<!ELEMENT separators (separator*)>
-
-<!ELEMENT separator (#PCDATA)>
-<!ATTLIST separator name CDATA #REQUIRED>
-
 <!ELEMENT value (#PCDATA)>
 
 <!ELEMENT constraints ((fill* | check* | condition* | group*)*)>

src/rougail/tiramisureflector.py

@@ -8,7 +8,7 @@ from .annotator import ERASED_ATTRIBUTES, CONVERT_OPTION
 
 
 FUNC_TO_DICT = []
-FORCE_INFORMATIONS = ['help', 'test', 'separator', 'manage']
+FORCE_INFORMATIONS = ['help', 'test', 'manage']
 ATTRIBUTES_ORDER = ('name', 'doc', 'default', 'multi')
 
 

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

@@ -9,7 +9,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
     <constraints>
         <fill name="calc_val" target="mode_conteneur_actif">

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

@@ -13,7 +13,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab

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

@@ -13,7 +13,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab

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

@@ -13,7 +13,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab

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

@@ -9,7 +9,6 @@
                 <value>0.527</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab

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

@@ -9,7 +9,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
     <constraints>
         <fill name="calc_val" target="mode_conteneur_actif">

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

@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail>
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-        <separators>
-            <separator name="mode_conteneur_actif">Établissement</separator>
-        </separators>
-    </variables>
-</rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

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

@@ -1 +0,0 @@
-{"rougail.general.mode_conteneur_actif": "non"}

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

@@ -1,15 +0,0 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
-for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
-        setattr(func, key, value)
-try:
-    from tiramisu3 import *
-except:
-    from tiramisu import *
-from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
-option_3.impl_set_information("separator", "Établissement")
-option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
-option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
-option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

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

@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail>
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-        <separators>
-            <separator name="mode_conteneur_actif">Établissement</separator>
-        </separators>
-    </variables>
-</rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

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

@@ -1 +0,0 @@
-{"rougail.general.mode_conteneur_actif": "non"}

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

@@ -1,15 +0,0 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
-for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
-        setattr(func, key, value)
-try:
-    from tiramisu3 import *
-except:
-    from tiramisu import *
-from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
-option_3.impl_set_information("separator", "Établissement")
-option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
-option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
-option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

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

@@ -4,7 +4,6 @@
         <family name="general">
             <variable name="mode_conteneur_actif3" redefine="True"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>

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

@@ -14,7 +14,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>

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

@@ -14,7 +14,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>

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

@@ -14,7 +14,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>

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

@@ -11,7 +11,6 @@
                 <value>c</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>

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

@@ -10,7 +10,6 @@
         <family name="enumfam" mode="expert">
             <variable name="enumvar" type="string" description="multi" mandatory="True"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>

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

@@ -11,7 +11,6 @@
                 <value>b</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>

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

@@ -9,7 +9,6 @@
         <family name="enumfam" mode="expert">
             <variable name="enumvar" type="string" description="multi" help="bla bla bla"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>

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

@@ -9,7 +9,6 @@
         <family name="enumfam" mode="expert">
             <variable name="enumvar" type="string" description="multi" help="bla bla bla"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>

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

@@ -13,7 +13,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab

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

@@ -13,7 +13,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab

tests/dictionaries/51redefine_autofill/00-base.xml

@@ -6,7 +6,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>

tests/dictionaries/51redefine_remove_check/00-base.xml

@@ -4,7 +4,6 @@
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>

tests/dictionaries/51redefine_value/01-redefine.xml

@@ -6,7 +6,6 @@
                 <value>oui</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab

tests/dictionaries/52exists_redefine/01-base.xml

@@ -6,7 +6,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab

tests/dictionaries/60extra_group/00-base.xml

@@ -14,6 +14,5 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 </rougail>

tests/dictionaries/60extra_help/00-base.xml

@@ -16,7 +16,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab

tests/dictionaries/60extra_separators/00-base.xml

@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail>
-    <variables>
-        <family name="général">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-            <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-    </variables>
-</rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/60extra_separators/extra_dirs/extra/00-base.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail>
-    <variables>
-        <family name='ejabberd'>
-            <variable name="description" type="string">
-                <value>Exportation de la base de ejabberd</value>
-            </variable>
-            <variable name="day" type="schedule"></variable>
-            <variable name="mode" type="schedulemod">
-                <value>pre</value>
-            </variable>
-        </family>
-        <separators>
-            <separator name="extra.ejabberd.day">Séparateur</separator>
-        </separators>
-    </variables>
-    <constraints>
-        <fill name='calc_multi_condition' target='extra.ejabberd.day'>
-            <param>non</param>
-            <param type='variable' name='condition_1' notraisepropertyerror='True'>activer_ejabberd</param>
-            <param name='match'>none</param>
-            <param name='mismatch'>daily</param>
-        </fill>
-    </constraints>
-</rougail>

tests/dictionaries/60extra_separators/makedict/base.json

@@ -1 +0,0 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.general.activer_ejabberd": "non", "extra.ejabberd.description": "Exportation de la base de ejabberd", "extra.ejabberd.day": null, "extra.ejabberd.mode": "pre"}

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

@@ -1,21 +0,0 @@
-from importlib.machinery import SourceFileLoader
-func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
-for key, value in dict(locals()).items():
-    if key != ['SourceFileLoader', 'func']:
-        setattr(func, key, value)
-try:
-    from tiramisu3 import *
-except:
-    from tiramisu import *
-from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non')
-option_4 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='activer_ejabberd', doc='No change', multi=False, default='non')
-option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4])
-option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
-option_7 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='description', doc='description', multi=False, default='Exportation de la base de ejabberd')
-option_8 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='day', doc='day', multi=False, default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True, todict=False), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), values=('none', 'daily', 'weekly', 'monthly'))
-option_8.impl_set_information("separator", "Séparateur")
-option_9 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode', doc='mode', multi=False, default='pre', values=('pre', 'post'))
-option_6 = OptionDescription(name='ejabberd', doc='ejabberd', properties=frozenset({'normal'}), children=[option_7, option_8, option_9])
-option_5 = OptionDescription(name='extra', doc='extra', children=[option_6])
-option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5])

tests/dictionaries/60familyaction_mandatory/60familyaction/00-base.xml

@@ -11,7 +11,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>

tests/dictionaries/60familyaction_mandatory/60familyaction/result/00-base.xml

@@ -140,7 +140,6 @@
         <value>non</value>
       </variable>
     </family>
-    <separators/>
   </family>
   <family doc="" name="extra">
     <family hidden="False" mode="basic" doc="test" name="test">

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

@@ -15,6 +15,5 @@
                 <value>/etc/mailname2</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 </rougail>

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

@@ -19,6 +19,5 @@
                 <value>mailname2</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 </rougail>

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

@@ -17,6 +17,5 @@
                 <value>mailname</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 </rougail>

tests/dictionaries/80condition_not_exists_error/00-base.xml

@@ -6,7 +6,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>

tests/dictionaries/80condition_not_exists_error_var/00-base.xml

@@ -6,7 +6,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>

tests/dictionaries/80container_files_symlink_without_source/00-base.xml

@@ -14,6 +14,5 @@
                 <value>/etc/mailname</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 </rougail>

tests/dictionaries/80redefine_double_error/00-base.xml

@@ -6,7 +6,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab

tests/dictionaries/80redefine_error/00-base.xml

@@ -6,7 +6,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab

tests/dictionaries/80redefine_fillerror/00-base.xml

@@ -6,7 +6,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>

tests/dictionaries/80separator_multi/00-base.xml

@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail>
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-        <separators>
-            <separator name="mode_conteneur_actif">Établissement</separator>
-            <separator name="mode_conteneur_actif">Établissement</separator>
-        </separators>
-    </variables>
-</rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/80separator_multi2/00-base.xml

@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail>
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-        <separators>
-            <separator name="mode_conteneur_actif">Établissement</separator>
-        </separators>
-    </variables>
-</rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/80separator_multi2/01-base.xml

@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail>
-    <variables>
-        <separators>
-            <separator name="mode_conteneur_actif">Établissement</separator>
-        </separators>
-    </variables>
-</rougail>

tests/dictionaries/80separator_nonexists/00-base.xml

@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail>
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
-        </family>
-        <separators>
-            <separator name="mode_conteneur_actif">Établissement</separator>
-            <separator name="nonexist_variable">separator</separator>
-        </separators>
-    </variables>
-</rougail>
-<!-- vim: ts=4 sw=4 expandtab
--->

tests/dictionaries/80valid_enum_no_param/00-base.xml

@@ -11,7 +11,6 @@
                 <value>c</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>

tests/dictionaries/88valid_enum_not_number/00-base.xml

@@ -9,7 +9,6 @@
         <family name="enumfam" mode="expert">
             <variable name="enumvar" type="number" description="enumvar"/>
         </family>
-        <separators/>
     </variables>
 
     <constraints>

tests/dictionaries/88valid_enum_not_number2/00-base.xml

@@ -11,7 +11,6 @@
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>