diff --git a/src/rougail/annotator/variable.py b/src/rougail/annotator/variable.py
index df7337cd..4ef19729 100644
--- a/src/rougail/annotator/variable.py
+++ b/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_separators()
+ self.convert_variable()
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
diff --git a/src/rougail/data/rougail.dtd b/src/rougail/data/rougail.dtd
index aa9cbe68..53a3ee33 100644
--- a/src/rougail/data/rougail.dtd
+++ b/src/rougail/data/rougail.dtd
@@ -79,7 +79,7 @@
-
+
@@ -107,11 +107,6 @@
-
-
-
-
-
diff --git a/src/rougail/tiramisureflector.py b/src/rougail/tiramisureflector.py
index baa44dbc..77a43661 100644
--- a/src/rougail/tiramisureflector.py
+++ b/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')
diff --git a/tests/dictionaries/01auto_autofreeze/00-base.xml b/tests/dictionaries/01auto_autofreeze/00-base.xml
index 4e0b5bee..a46d30df 100644
--- a/tests/dictionaries/01auto_autofreeze/00-base.xml
+++ b/tests/dictionaries/01auto_autofreeze/00-base.xml
@@ -9,7 +9,6 @@
non
-
diff --git a/tests/dictionaries/01base_file_include/00-base.xml b/tests/dictionaries/01base_file_include/00-base.xml
index c2af7788..fdc87d2d 100644
--- a/tests/dictionaries/01base_file_include/00-base.xml
+++ b/tests/dictionaries/01base_file_include/00-base.xml
@@ -13,7 +13,6 @@
non
-
diff --git a/tests/dictionaries/01separator_base/__init__.py b/tests/dictionaries/01separator_base/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/dictionaries/01separator_base/makedict/base.json b/tests/dictionaries/01separator_base/makedict/base.json
deleted file mode 100644
index 797595b0..00000000
--- a/tests/dictionaries/01separator_base/makedict/base.json
+++ /dev/null
@@ -1 +0,0 @@
-{"rougail.general.mode_conteneur_actif": "non"}
diff --git a/tests/dictionaries/01separator_base/tiramisu/__init__.py b/tests/dictionaries/01separator_base/tiramisu/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/dictionaries/01separator_base/tiramisu/base.py b/tests/dictionaries/01separator_base/tiramisu/base.py
deleted file mode 100644
index cfab94ac..00000000
--- a/tests/dictionaries/01separator_base/tiramisu/base.py
+++ /dev/null
@@ -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])
diff --git a/tests/dictionaries/01separator_neverhidden/00-base.xml b/tests/dictionaries/01separator_neverhidden/00-base.xml
deleted file mode 100644
index b047fee5..00000000
--- a/tests/dictionaries/01separator_neverhidden/00-base.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
- non
-
-
-
- Établissement
-
-
-
-
diff --git a/tests/dictionaries/01separator_neverhidden/__init__.py b/tests/dictionaries/01separator_neverhidden/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/dictionaries/01separator_neverhidden/makedict/base.json b/tests/dictionaries/01separator_neverhidden/makedict/base.json
deleted file mode 100644
index 797595b0..00000000
--- a/tests/dictionaries/01separator_neverhidden/makedict/base.json
+++ /dev/null
@@ -1 +0,0 @@
-{"rougail.general.mode_conteneur_actif": "non"}
diff --git a/tests/dictionaries/01separator_neverhidden/tiramisu/__init__.py b/tests/dictionaries/01separator_neverhidden/tiramisu/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/dictionaries/01separator_neverhidden/tiramisu/base.py b/tests/dictionaries/01separator_neverhidden/tiramisu/base.py
deleted file mode 100644
index cfab94ac..00000000
--- a/tests/dictionaries/01separator_neverhidden/tiramisu/base.py
+++ /dev/null
@@ -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])
diff --git a/tests/dictionaries/10check_valid_differ_add/01-base.xml b/tests/dictionaries/10check_valid_differ_add/01-base.xml
index 05fdad68..208ea690 100644
--- a/tests/dictionaries/10check_valid_differ_add/01-base.xml
+++ b/tests/dictionaries/10check_valid_differ_add/01-base.xml
@@ -4,7 +4,6 @@
-
diff --git a/tests/dictionaries/10load_frozenifin_noexist/00-base.xml b/tests/dictionaries/10load_frozenifin_noexist/00-base.xml
index 4416a231..71ad9db5 100644
--- a/tests/dictionaries/10load_frozenifin_noexist/00-base.xml
+++ b/tests/dictionaries/10load_frozenifin_noexist/00-base.xml
@@ -14,7 +14,6 @@
non
-
diff --git a/tests/dictionaries/10load_frozenifnotin_noexist/00-base.xml b/tests/dictionaries/10load_frozenifnotin_noexist/00-base.xml
index 9d1bbff2..07d2c45b 100644
--- a/tests/dictionaries/10load_frozenifnotin_noexist/00-base.xml
+++ b/tests/dictionaries/10load_frozenifnotin_noexist/00-base.xml
@@ -14,7 +14,6 @@
non
-
diff --git a/tests/dictionaries/10load_mandatoryifnotin_noexist/00-base.xml b/tests/dictionaries/10load_mandatoryifnotin_noexist/00-base.xml
index baf163ce..f73b4da4 100644
--- a/tests/dictionaries/10load_mandatoryifnotin_noexist/00-base.xml
+++ b/tests/dictionaries/10load_mandatoryifnotin_noexist/00-base.xml
@@ -14,7 +14,6 @@
non
-
diff --git a/tests/dictionaries/10valid_enum_base/00-base.xml b/tests/dictionaries/10valid_enum_base/00-base.xml
index 995d6365..3a461cb1 100644
--- a/tests/dictionaries/10valid_enum_base/00-base.xml
+++ b/tests/dictionaries/10valid_enum_base/00-base.xml
@@ -11,7 +11,6 @@
c
-
diff --git a/tests/dictionaries/10valid_enum_mandatory/00-base.xml b/tests/dictionaries/10valid_enum_mandatory/00-base.xml
index 0538ebf3..98475c8a 100644
--- a/tests/dictionaries/10valid_enum_mandatory/00-base.xml
+++ b/tests/dictionaries/10valid_enum_mandatory/00-base.xml
@@ -10,7 +10,6 @@
-
diff --git a/tests/dictionaries/10valid_enum_none/00-base.xml b/tests/dictionaries/10valid_enum_none/00-base.xml
index 67f48888..0f34cb86 100644
--- a/tests/dictionaries/10valid_enum_none/00-base.xml
+++ b/tests/dictionaries/10valid_enum_none/00-base.xml
@@ -11,7 +11,6 @@
b
-
diff --git a/tests/dictionaries/10valid_enum_param_empty/00-base.xml b/tests/dictionaries/10valid_enum_param_empty/00-base.xml
index 59b7d8fa..1910723e 100644
--- a/tests/dictionaries/10valid_enum_param_empty/00-base.xml
+++ b/tests/dictionaries/10valid_enum_param_empty/00-base.xml
@@ -9,7 +9,6 @@
-
diff --git a/tests/dictionaries/10valid_enum_param_empty2/00-base.xml b/tests/dictionaries/10valid_enum_param_empty2/00-base.xml
index 461793f7..6edacb81 100644
--- a/tests/dictionaries/10valid_enum_param_empty2/00-base.xml
+++ b/tests/dictionaries/10valid_enum_param_empty2/00-base.xml
@@ -9,7 +9,6 @@
-
diff --git a/tests/dictionaries/20notemplating/00-base.xml b/tests/dictionaries/20notemplating/00-base.xml
index c73dc8fc..0644dd26 100644
--- a/tests/dictionaries/20notemplating/00-base.xml
+++ b/tests/dictionaries/20notemplating/00-base.xml
@@ -13,7 +13,6 @@
non
-
diff --git a/tests/dictionaries/60extra_separators/__init__.py b/tests/dictionaries/60extra_separators/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/dictionaries/60extra_separators/extra_dirs/extra/00-base.xml b/tests/dictionaries/60extra_separators/extra_dirs/extra/00-base.xml
deleted file mode 100644
index f51f8a14..00000000
--- a/tests/dictionaries/60extra_separators/extra_dirs/extra/00-base.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
- Exportation de la base de ejabberd
-
-
-
- pre
-
-
-
- Séparateur
-
-
-
-
- non
- activer_ejabberd
- none
- daily
-
-
-
diff --git a/tests/dictionaries/60extra_separators/makedict/base.json b/tests/dictionaries/60extra_separators/makedict/base.json
deleted file mode 100644
index 816c41bd..00000000
--- a/tests/dictionaries/60extra_separators/makedict/base.json
+++ /dev/null
@@ -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"}
diff --git a/tests/dictionaries/60extra_separators/tiramisu/__init__.py b/tests/dictionaries/60extra_separators/tiramisu/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/dictionaries/60extra_separators/tiramisu/base.py b/tests/dictionaries/60extra_separators/tiramisu/base.py
deleted file mode 100644
index 19c4d9ef..00000000
--- a/tests/dictionaries/60extra_separators/tiramisu/base.py
+++ /dev/null
@@ -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])
diff --git a/tests/dictionaries/60familyaction_mandatory/60familyaction/00-base.xml b/tests/dictionaries/60familyaction_mandatory/60familyaction/00-base.xml
index 3a297e28..329e2f45 100644
--- a/tests/dictionaries/60familyaction_mandatory/60familyaction/00-base.xml
+++ b/tests/dictionaries/60familyaction_mandatory/60familyaction/00-base.xml
@@ -11,7 +11,6 @@
non
-
diff --git a/tests/dictionaries/60familyaction_mandatory/60familyaction/result/00-base.xml b/tests/dictionaries/60familyaction_mandatory/60familyaction/result/00-base.xml
index 91045829..0e63de5a 100644
--- a/tests/dictionaries/60familyaction_mandatory/60familyaction/result/00-base.xml
+++ b/tests/dictionaries/60familyaction_mandatory/60familyaction/result/00-base.xml
@@ -140,7 +140,6 @@
non
-
diff --git a/tests/dictionaries/70container_files_symlink_multi/00-base.xml b/tests/dictionaries/70container_files_symlink_multi/00-base.xml
index 0f00a51d..afb2b6fc 100644
--- a/tests/dictionaries/70container_files_symlink_multi/00-base.xml
+++ b/tests/dictionaries/70container_files_symlink_multi/00-base.xml
@@ -15,6 +15,5 @@
/etc/mailname2
-
diff --git a/tests/dictionaries/70container_files_symlink_multi_variable/00-base.xml b/tests/dictionaries/70container_files_symlink_multi_variable/00-base.xml
index e5b770eb..056b4c22 100644
--- a/tests/dictionaries/70container_files_symlink_multi_variable/00-base.xml
+++ b/tests/dictionaries/70container_files_symlink_multi_variable/00-base.xml
@@ -19,6 +19,5 @@
mailname2
-
diff --git a/tests/dictionaries/70container_files_symlink_variable/00-base.xml b/tests/dictionaries/70container_files_symlink_variable/00-base.xml
index 68fb16dc..bb6103a4 100644
--- a/tests/dictionaries/70container_files_symlink_variable/00-base.xml
+++ b/tests/dictionaries/70container_files_symlink_variable/00-base.xml
@@ -17,6 +17,5 @@
mailname
-
diff --git a/tests/dictionaries/80condition_not_exists_error/00-base.xml b/tests/dictionaries/80condition_not_exists_error/00-base.xml
index 1d4bea32..ec9ced92 100644
--- a/tests/dictionaries/80condition_not_exists_error/00-base.xml
+++ b/tests/dictionaries/80condition_not_exists_error/00-base.xml
@@ -6,7 +6,6 @@
non
-
diff --git a/tests/dictionaries/80condition_not_exists_error_var/00-base.xml b/tests/dictionaries/80condition_not_exists_error_var/00-base.xml
index c83eb94b..3ab218b5 100644
--- a/tests/dictionaries/80condition_not_exists_error_var/00-base.xml
+++ b/tests/dictionaries/80condition_not_exists_error_var/00-base.xml
@@ -6,7 +6,6 @@
non
-
diff --git a/tests/dictionaries/80container_files_symlink_without_source/00-base.xml b/tests/dictionaries/80container_files_symlink_without_source/00-base.xml
index 7d0759ce..d4e49792 100644
--- a/tests/dictionaries/80container_files_symlink_without_source/00-base.xml
+++ b/tests/dictionaries/80container_files_symlink_without_source/00-base.xml
@@ -14,6 +14,5 @@
/etc/mailname
-
diff --git a/tests/dictionaries/80redefine_double_error/00-base.xml b/tests/dictionaries/80redefine_double_error/00-base.xml
index 0bb9ed31..cb0d55db 100644
--- a/tests/dictionaries/80redefine_double_error/00-base.xml
+++ b/tests/dictionaries/80redefine_double_error/00-base.xml
@@ -6,7 +6,6 @@
non
-
diff --git a/tests/dictionaries/80separator_multi/__init__.py b/tests/dictionaries/80separator_multi/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/dictionaries/80separator_multi/errno_35 b/tests/dictionaries/80separator_multi/errno_35
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/dictionaries/80separator_multi2/00-base.xml b/tests/dictionaries/80separator_multi2/00-base.xml
deleted file mode 100644
index b047fee5..00000000
--- a/tests/dictionaries/80separator_multi2/00-base.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
- non
-
-
-
- Établissement
-
-
-
-
diff --git a/tests/dictionaries/80separator_multi2/01-base.xml b/tests/dictionaries/80separator_multi2/01-base.xml
deleted file mode 100644
index 69191a32..00000000
--- a/tests/dictionaries/80separator_multi2/01-base.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- Établissement
-
-
-
diff --git a/tests/dictionaries/80separator_multi2/__init__.py b/tests/dictionaries/80separator_multi2/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/dictionaries/80separator_multi2/errno_35 b/tests/dictionaries/80separator_multi2/errno_35
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/dictionaries/80separator_nonexists/00-base.xml b/tests/dictionaries/80separator_nonexists/00-base.xml
deleted file mode 100644
index 543e0389..00000000
--- a/tests/dictionaries/80separator_nonexists/00-base.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
- non
-
-
-
- Établissement
- separator
-
-
-
-
diff --git a/tests/dictionaries/80separator_nonexists/__init__.py b/tests/dictionaries/80separator_nonexists/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/dictionaries/80separator_nonexists/errno_42 b/tests/dictionaries/80separator_nonexists/errno_42
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/dictionaries/80valid_enum_no_param/00-base.xml b/tests/dictionaries/80valid_enum_no_param/00-base.xml
index 1f105d00..762c7f4a 100644
--- a/tests/dictionaries/80valid_enum_no_param/00-base.xml
+++ b/tests/dictionaries/80valid_enum_no_param/00-base.xml
@@ -11,7 +11,6 @@
c
-
diff --git a/tests/dictionaries/88valid_enum_not_number/00-base.xml b/tests/dictionaries/88valid_enum_not_number/00-base.xml
index 5a277a60..d24f4c35 100644
--- a/tests/dictionaries/88valid_enum_not_number/00-base.xml
+++ b/tests/dictionaries/88valid_enum_not_number/00-base.xml
@@ -9,7 +9,6 @@
-
diff --git a/tests/dictionaries/88valid_enum_not_number2/00-base.xml b/tests/dictionaries/88valid_enum_not_number2/00-base.xml
index 0cb31420..e1355fb4 100644
--- a/tests/dictionaries/88valid_enum_not_number2/00-base.xml
+++ b/tests/dictionaries/88valid_enum_not_number2/00-base.xml
@@ -11,7 +11,6 @@
non
-