From 001a3131d510889a5636391475393648a850f703 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Sun, 24 Jan 2021 18:50:24 +0100 Subject: [PATCH] simplify tiramisureflector --- FIXME | 3 + src/rougail/tiramisureflector.py | 82 ++++++++----------- tests/dictionaries/00empty/tiramisu/base.py | 2 +- .../01auto_autofreeze/tiramisu/base.py | 2 +- .../01base_file_include/tiramisu/base.py | 2 +- .../01base_file_patch/tiramisu/base.py | 2 +- .../01base_file_utfchar/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- tests/dictionaries/01test/tiramisu/base.py | 2 +- .../01test_multi/tiramisu/base.py | 2 +- .../01test_multi_none/tiramisu/base.py | 2 +- .../01test_redefine/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../10autosave_hidden/tiramisu/base.py | 2 +- .../10check_option/tiramisu/base.py | 2 +- .../10leadership_append/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../10leadership_append_name/tiramisu/base.py | 2 +- .../10leadership_auto/tiramisu/base.py | 2 +- .../10leadership_autoleader/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../10leadership_mandatory/tiramisu/base.py | 2 +- .../10leadership_multi/tiramisu/base.py | 2 +- .../10load_frozenifin_auto/tiramisu/base.py | 2 +- .../10load_leadership/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../10load_leadership_name/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../10valid_enum_accent/tiramisu/base.py | 2 +- .../10valid_enum_base/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../10valid_enum_none/tiramisu/base.py | 2 +- .../10valid_enum_number/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../10valid_enum_param_empty/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../20notemplating/tiramisu/base.py | 2 +- .../dictionaries/20override/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../40empty_param/tiramisu/base.py | 2 +- .../40empty_param2/tiramisu/base.py | 2 +- .../40ifin_leadershipauto/tiramisu/base.py | 4 +- .../tiramisu/base.py | 4 +- .../51redefine_auto/tiramisu/base.py | 2 +- .../51redefine_autofill/tiramisu/base.py | 2 +- .../51redefine_fill/tiramisu/base.py | 2 +- .../51redefine_fillauto/tiramisu/base.py | 2 +- .../51redefine_help/tiramisu/base.py | 4 +- .../60action_external/tiramisu/base.py | 2 +- .../60extra_group/tiramisu/base.py | 2 +- .../60extra_help/tiramisu/base.py | 6 +- .../60extra_load/tiramisu/base.py | 2 +- .../60extra_mandatory/tiramisu/base.py | 2 +- .../60extra_name_family/tiramisu/base.py | 2 +- .../60extra_redefine/tiramisu/base.py | 2 +- .../70container_files/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../70container_files_twice/tiramisu/base.py | 2 +- .../70container_filesmulti/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../70container_new/tiramisu/base.py | 2 +- .../70container_newnocont/tiramisu/base.py | 2 +- .../70container_newwithip/tiramisu/base.py | 2 +- .../70container_pathaccess/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../70container_services/tiramisu/base.py | 2 +- .../70services_unmanage/tiramisu/base.py | 2 +- 84 files changed, 125 insertions(+), 134 deletions(-) diff --git a/FIXME b/FIXME index 2ebe5d60e..074f09bf9 100644 --- a/FIXME +++ b/FIXME @@ -1,2 +1,5 @@ default avec quote values avec quote +informations avec quote (help) +param value avec quote +suffix avec quote dans param ? diff --git a/src/rougail/tiramisureflector.py b/src/rougail/tiramisureflector.py index e569b814c..42f9d8da2 100644 --- a/src/rougail/tiramisureflector.py +++ b/src/rougail/tiramisureflector.py @@ -56,7 +56,7 @@ class TiramisuReflector: self.set_name(baseelt) basefamily = Family(baseelt, self.text, - False, + self.objectspace, ) for elt in self.reorder_family(): self.populate_family(basefamily, @@ -87,7 +87,7 @@ class TiramisuReflector: self.set_name(elt) family = Family(elt, self.text, - isinstance(elt, self.objectspace.leadership), + self.objectspace, ) parent_family.add(family) for children in vars(elt).values(): @@ -134,10 +134,12 @@ class Common: def __init__(self, elt, text, + objectspace, ): self.elt = elt self.option_name = None self.text = text + self.objectspace = objectspace self.elt.reflector_object = self self.object_type = None @@ -153,17 +155,13 @@ class Common: def populate_attrib(self): """Populate attributes """ - keys = {} - keys['name'] = self.convert_str(self.elt.name) + keys = {'name': self.convert_str(self.elt.name)} if hasattr(self.elt, 'doc'): keys['doc'] = self.convert_str(self.elt.doc) self._populate_attrib(keys) if hasattr(self.elt, 'properties'): keys['properties'] = self.properties_to_string(self.elt.properties) - ret_list = [] - for key, value in keys.items(): - ret_list.append(f'{key}={value}') - attrib = ', '.join(ret_list) + attrib = ', '.join([f'{key}={value}' for key, value in keys.items()]) self.text.append(f'{self.option_name} = {self.object_type}({attrib})') def _populate_attrib(self, @@ -178,31 +176,25 @@ class Common: return "'" + value.replace("'", "\\\'") + "'" def properties_to_string(self, - value: list, + values: list, ) -> None: """Change properties to string """ - properties = [] - calc_properties = [] - for property_ in value: - if not isinstance(property_, str): - calc_properties.append(self.populate_properties(property_)) - else: - properties.append(f"'{property_}'") + properties = [f"'{property_}'" for property_ in values if isinstance(property_, str)] + calc_properties = [self.calc_properties(property_) for property_ in values \ + if isinstance(property_, self.objectspace.property_)] return 'frozenset({' + ', '.join(sorted(properties) + calc_properties) + '})' @staticmethod - def populate_properties(child) -> str: + def calc_properties(child) -> str: """Populate properties """ - assert child.type == 'calculation' - action = f"ParamValue('{child.name}')" option_name = child.source.reflector_object.get() kwargs = (f"'condition': ParamOption({option_name}, todict=True), " f"'expected': ParamValue('{child.expected}')") if child.inverse: kwargs += ", 'reverse_condition': ParamValue(True)" - return 'Calculation(calc_value, Params(' + action + ', kwargs={' + kwargs + '}))' + return f"Calculation(calc_value, Params(ParamValue('{child.name}'), kwargs={{{kwargs}}}))" def populate_informations(self): """Populate Tiramisu's informations @@ -213,8 +205,8 @@ class Common: if key == 'xmlfiles': continue if isinstance(value, str): - value = '"' + value.replace('"', '\"') + '"' - self.text.append(f'{self.option_name}.impl_set_information("{key}", {value})') + value = self.convert_str(value) + self.text.append(f"{self.option_name}.impl_set_information('{key}', {value})") class Variable(Common): @@ -225,10 +217,8 @@ class Variable(Common): text, objectspace, ): - super().__init__(elt, text) - self.objectspace = objectspace - convert_option = CONVERT_OPTION[elt.type] - self.object_type = convert_option['opttype'] + super().__init__(elt, text, objectspace) + self.object_type = CONVERT_OPTION[elt.type]['opttype'] def _populate_attrib(self, keys: dict, @@ -238,8 +228,8 @@ class Variable(Common): if hasattr(self.elt, 'values'): values = self.elt.values if values[0].type == 'calculation': - values = values[0].name.reflector_object.get() - keys['values'] = f"Calculation(func.calc_value, Params((ParamOption({values}))))" + value = values[0].name.reflector_object.get() + keys['values'] = f"Calculation(func.calc_value, Params((ParamOption({value}))))" else: keys['values'] = str(tuple([val.name for val in values])) if hasattr(self.elt, 'multi') and self.elt.multi: @@ -292,18 +282,14 @@ class Variable(Common): """Populate variable parameters """ if param.type == 'string': - return f'ParamValue("{param.text}")' + value = param.text + if value is not None: + value = self.convert_str(value) + return f"ParamValue({value})" if param.type == 'number': return f'ParamValue({param.text})' if param.type == 'variable': - value = {'option': param.text, - 'notraisepropertyerror': param.notraisepropertyerror, - 'todict': function in FUNC_TO_DICT, - } - if hasattr(param, 'suffix'): - value['suffix'] = param.suffix - value['family'] = param.family - return self.build_param(value) + return self.build_param(param, function) if param.type == 'information': return f'ParamInformation("{param.text}", None)' if param.type == 'suffix': @@ -311,14 +297,17 @@ class Variable(Common): return '' # pragma: no cover @staticmethod - def build_param(param) -> str: + def build_param(param, + function: str, + ) -> str: """build variable parameters """ - option_name = param['option'].reflector_object.get() - ends = f"notraisepropertyerror={param['notraisepropertyerror']}, todict={param['todict']})" - if 'suffix' in param: - family_name = param['family'].reflector_name - return f"ParamDynOption({option_name}, '{param['suffix']}', {family_name}, {ends}" + option_name = param.text.reflector_object.get() + todict = function in FUNC_TO_DICT + ends = f"notraisepropertyerror={param.notraisepropertyerror}, todict={todict})" + if hasattr(param, 'suffix'): + family_name = param.family.reflector_name + return f"ParamDynOption({option_name}, '{param.suffix}', {family_name}, {ends}" return f"ParamOption({option_name}, {ends}" @@ -328,13 +317,12 @@ class Family(Common): def __init__(self, elt, text, - is_leadership + objectspace, ): - super().__init__(elt, text) - self.is_leadership = is_leadership + super().__init__(elt, text, objectspace) if hasattr(self.elt, 'suffixes'): self.object_type = 'ConvertDynOptionDescription' - elif self.is_leadership: + elif isinstance(self.elt, self.objectspace.leadership): self.object_type = 'Leadership' else: self.object_type = 'OptionDescription' diff --git a/tests/dictionaries/00empty/tiramisu/base.py b/tests/dictionaries/00empty/tiramisu/base.py index 2e3fd9578..75b74168d 100644 --- a/tests/dictionaries/00empty/tiramisu/base.py +++ b/tests/dictionaries/00empty/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_2 = OptionDescription(name='tata', doc='tata', children=[]) -option_2.impl_set_information("manage", True) +option_2.impl_set_information('manage', True) option_1 = OptionDescription(name='services', doc='services', children=[option_2], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01auto_autofreeze/tiramisu/base.py b/tests/dictionaries/01auto_autofreeze/tiramisu/base.py index 47b0f475b..c9cc76848 100644 --- a/tests/dictionaries/01auto_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/01auto_autofreeze/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='module_instancie', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'frozen', 'hidden', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) +option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue('oui')))), properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'frozen', 'hidden', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'basic'})) 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/01base_file_include/tiramisu/base.py b/tests/dictionaries/01base_file_include/tiramisu/base.py index c8b929df2..7c4b74973 100644 --- a/tests/dictionaries/01base_file_include/tiramisu/base.py +++ b/tests/dictionaries/01base_file_include/tiramisu/base.py @@ -25,6 +25,6 @@ option_14 = BoolOption(name='activate', doc='activate', default=True) option_7 = OptionDescription(name='file', doc='file', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14]) option_6 = OptionDescription(name='files', doc='files', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) -option_5.impl_set_information("manage", True) +option_5.impl_set_information('manage', True) option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/01base_file_patch/tiramisu/base.py b/tests/dictionaries/01base_file_patch/tiramisu/base.py index c8b929df2..7c4b74973 100644 --- a/tests/dictionaries/01base_file_patch/tiramisu/base.py +++ b/tests/dictionaries/01base_file_patch/tiramisu/base.py @@ -25,6 +25,6 @@ option_14 = BoolOption(name='activate', doc='activate', default=True) option_7 = OptionDescription(name='file', doc='file', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14]) option_6 = OptionDescription(name='files', doc='files', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) -option_5.impl_set_information("manage", True) +option_5.impl_set_information('manage', True) option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/01base_file_utfchar/tiramisu/base.py b/tests/dictionaries/01base_file_utfchar/tiramisu/base.py index bf2500873..041586d75 100644 --- a/tests/dictionaries/01base_file_utfchar/tiramisu/base.py +++ b/tests/dictionaries/01base_file_utfchar/tiramisu/base.py @@ -25,6 +25,6 @@ option_14 = BoolOption(name='activate', doc='activate', default=True) option_7 = OptionDescription(name='systemd_makefs@dev_disk_by\\x2dpartlabel', doc='systemd-makefs@dev-disk-by\\x2dpartlabel', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14]) option_6 = OptionDescription(name='files', doc='files', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) -option_5.impl_set_information("manage", True) +option_5.impl_set_information('manage', True) option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py b/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py index 7fe4fde5a..57f0cadbb 100644 --- a/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='module_instancie', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({'auto_freeze', 'basic', 'force_store_value', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) +option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue('oui')))), properties=frozenset({'auto_freeze', 'basic', 'force_store_value', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'basic'})) 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/01test/tiramisu/base.py b/tests/dictionaries/01test/tiramisu/base.py index 7fa565761..4d42cad5c 100644 --- a/tests/dictionaries/01test/tiramisu/base.py +++ b/tests/dictionaries/01test/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', properties=frozenset({'mandatory', 'normal'})) -option_3.impl_set_information("test", ('test',)) +option_3.impl_set_information('test', ('test',)) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) 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/01test_multi/tiramisu/base.py b/tests/dictionaries/01test_multi/tiramisu/base.py index 14acc0b1b..fd0a0bcd1 100644 --- a/tests/dictionaries/01test_multi/tiramisu/base.py +++ b/tests/dictionaries/01test_multi/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', properties=frozenset({'mandatory', 'normal'})) -option_3.impl_set_information("test", ('test1', 'test2')) +option_3.impl_set_information('test', ('test1', 'test2')) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) 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/01test_multi_none/tiramisu/base.py b/tests/dictionaries/01test_multi_none/tiramisu/base.py index 6db699275..eecf86ece 100644 --- a/tests/dictionaries/01test_multi_none/tiramisu/base.py +++ b/tests/dictionaries/01test_multi_none/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', properties=frozenset({'mandatory', 'normal'})) -option_3.impl_set_information("test", (None, 'test1', 'test2')) +option_3.impl_set_information('test', (None, 'test1', 'test2')) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) 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/01test_redefine/tiramisu/base.py b/tests/dictionaries/01test_redefine/tiramisu/base.py index 8dc8f29be..67c49ccf5 100644 --- a/tests/dictionaries/01test_redefine/tiramisu/base.py +++ b/tests/dictionaries/01test_redefine/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', properties=frozenset({'mandatory', 'normal'})) -option_3.impl_set_information("test", ('test1',)) +option_3.impl_set_information('test', ('test1',)) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) 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/02autosave_hidden_frozenifin/tiramisu/base.py b/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/base.py index 9d4fdbfe5..b20130a19 100644 --- a/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/base.py +++ b/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_4 = StrOption(name='autosavevar', doc='autosave variable', default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({'basic', 'force_store_value', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_4 = StrOption(name='autosavevar', doc='autosave variable', default=Calculation(func.calc_val, Params((ParamValue('oui')))), properties=frozenset({'basic', 'force_store_value', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'basic'})) 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/10autosave_hidden/tiramisu/base.py b/tests/dictionaries/10autosave_hidden/tiramisu/base.py index 265afb0fa..39b3e2a13 100644 --- a/tests/dictionaries/10autosave_hidden/tiramisu/base.py +++ b/tests/dictionaries/10autosave_hidden/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_4 = StrOption(name='autosavevar', doc='autosave variable', default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({'basic', 'force_store_value', 'frozen', 'hidden'})) +option_4 = StrOption(name='autosavevar', doc='autosave variable', default=Calculation(func.calc_val, Params((ParamValue('oui')))), properties=frozenset({'basic', 'force_store_value', 'frozen', 'hidden'})) option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'basic'})) 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_option/tiramisu/base.py b/tests/dictionaries/10check_option/tiramisu/base.py index b02917d41..9e2d92267 100644 --- a/tests/dictionaries/10check_option/tiramisu/base.py +++ b/tests/dictionaries/10check_option/tiramisu/base.py @@ -14,7 +14,7 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='b', properties=frozenset({'mandatory', 'normal'})) option_4 = IntOption(name='int2', doc='No change', default=100, properties=frozenset({'mandatory', 'normal'})) -option_5 = IntOption(name='int', doc='No change', validators=[Calculation(func.valid_lower, Params((ParamSelfOption()), kwargs={'mini': ParamValue("0"), 'maxi': ParamOption(option_4, notraisepropertyerror=False, todict=False)}), warnings_only=False)], properties=frozenset({'normal'})) +option_5 = IntOption(name='int', doc='No change', validators=[Calculation(func.valid_lower, Params((ParamSelfOption()), kwargs={'mini': ParamValue('0'), 'maxi': ParamOption(option_4, notraisepropertyerror=False, todict=False)}), warnings_only=False)], properties=frozenset({'normal'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10leadership_append/tiramisu/base.py b/tests/dictionaries/10leadership_append/tiramisu/base.py index 255c27311..ea08be67e 100644 --- a/tests/dictionaries/10leadership_append/tiramisu/base.py +++ b/tests/dictionaries/10leadership_append/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_6 = StrOption(name='leader', doc='leader', multi=True) -option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'})) +option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue('valfill')})), properties=frozenset({'normal'})) option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'})) option_9 = StrOption(name='follower3', doc='follower3', multi=True, properties=frozenset({'normal'})) option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8, option_9], properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py b/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py index 6d9eb4fa9..b25b8e179 100644 --- a/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py +++ b/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_6 = StrOption(name='leader', doc='leader', multi=True, properties=frozenset({'force_default_on_freeze', 'frozen'})) -option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'})) +option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue('valfill')})), properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'})) option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)))), properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'})) option_9 = StrOption(name='follower3', doc='follower3', multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'})) option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8, option_9], properties=frozenset({'hidden', 'normal'})) diff --git a/tests/dictionaries/10leadership_append_name/tiramisu/base.py b/tests/dictionaries/10leadership_append_name/tiramisu/base.py index e35eb5c82..52b1ace5d 100644 --- a/tests/dictionaries/10leadership_append_name/tiramisu/base.py +++ b/tests/dictionaries/10leadership_append_name/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_6 = StrOption(name='leader', doc='leader', multi=True) -option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'})) +option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue('valfill')})), properties=frozenset({'normal'})) option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'})) option_9 = StrOption(name='follower3', doc='follower3', multi=True, properties=frozenset({'normal'})) option_5 = Leadership(name='leadership', doc='leadership', children=[option_6, option_7, option_8, option_9], properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10leadership_auto/tiramisu/base.py b/tests/dictionaries/10leadership_auto/tiramisu/base.py index bd97de31c..ee7c9968a 100644 --- a/tests/dictionaries/10leadership_auto/tiramisu/base.py +++ b/tests/dictionaries/10leadership_auto/tiramisu/base.py @@ -14,7 +14,7 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) -option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue('valfill')})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)))), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_8 = StrOption(name='follower3', doc='follower3', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5, notraisepropertyerror=False, todict=False)))), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7, option_8], properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10leadership_autoleader/tiramisu/base.py b/tests/dictionaries/10leadership_autoleader/tiramisu/base.py index 79c0056db..dd9e7e2d9 100644 --- a/tests/dictionaries/10leadership_autoleader/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autoleader/tiramisu/base.py @@ -14,7 +14,7 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) -option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue('valfill')})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5, notraisepropertyerror=False, todict=False)))), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7], properties=frozenset({'normal'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py b/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py index 1abe63dd9..eaecfc639 100644 --- a/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py @@ -14,7 +14,7 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) -option_6 = StrOption(name='leader', doc='leader', multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")}))) +option_6 = StrOption(name='leader', doc='leader', multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue('valfill')}))) option_7 = StrOption(name='follower1', doc='follower1', multi=True, properties=frozenset({'expert'})) option_8 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'expert'})) option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8], properties=frozenset({'expert'})) diff --git a/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py b/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py index dac68a9a6..6d548a11a 100644 --- a/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py @@ -14,7 +14,7 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) -option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'})) +option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue('valfill')})), properties=frozenset({'normal'})) option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)))), properties=frozenset({'expert'})) option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7], properties=frozenset({'normal'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10leadership_familyaccent/tiramisu/base.py b/tests/dictionaries/10leadership_familyaccent/tiramisu/base.py index 484ca6c88..8ee721564 100644 --- a/tests/dictionaries/10leadership_familyaccent/tiramisu/base.py +++ b/tests/dictionaries/10leadership_familyaccent/tiramisu/base.py @@ -14,7 +14,7 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) -option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'})) +option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue('valfill')})), properties=frozenset({'normal'})) option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'})) option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7], properties=frozenset({'normal'})) option_2 = OptionDescription(name='general', doc='Général', children=[option_3, option_4], properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py b/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py index 4e174c988..06a43b3c6 100644 --- a/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py @@ -14,7 +14,7 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) -option_6 = StrOption(name='leader', doc='leader', multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'force_default_on_freeze', 'frozen'})) +option_6 = StrOption(name='leader', doc='leader', multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue('valfill')})), properties=frozenset({'force_default_on_freeze', 'frozen'})) option_7 = StrOption(name='follower1', doc='follower1', multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'})) option_8 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'})) option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8], properties=frozenset({'hidden', 'normal'})) diff --git a/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py b/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py index 7c02f1ca4..78f4f5705 100644 --- a/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py @@ -14,7 +14,7 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True, properties=frozenset({'mandatory'})) -option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'})) +option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue('valfill')})), properties=frozenset({'normal'})) option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'})) option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7], properties=frozenset({'basic'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'basic'})) diff --git a/tests/dictionaries/10leadership_mandatory/tiramisu/base.py b/tests/dictionaries/10leadership_mandatory/tiramisu/base.py index a38411300..f3fe96a2b 100644 --- a/tests/dictionaries/10leadership_mandatory/tiramisu/base.py +++ b/tests/dictionaries/10leadership_mandatory/tiramisu/base.py @@ -14,7 +14,7 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) -option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'mandatory', 'normal'})) +option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue('valfill')})), properties=frozenset({'mandatory', 'normal'})) option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'})) option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7], properties=frozenset({'normal'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10leadership_multi/tiramisu/base.py b/tests/dictionaries/10leadership_multi/tiramisu/base.py index 690e1d36c..4b7384d27 100644 --- a/tests/dictionaries/10leadership_multi/tiramisu/base.py +++ b/tests/dictionaries/10leadership_multi/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_6 = StrOption(name='leader', doc='leader', multi=True) -option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'})) +option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue('valfill')})), properties=frozenset({'normal'})) option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'})) option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8], properties=frozenset({'normal'})) option_10 = StrOption(name='leader1', doc='leader', multi=True) diff --git a/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py index d1a3c3173..185bcd24d 100644 --- a/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("non")))), properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue('non')))), properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/dictionaries/10load_leadership/tiramisu/base.py b/tests/dictionaries/10load_leadership/tiramisu/base.py index be696204b..2ede08ea1 100644 --- a/tests/dictionaries/10load_leadership/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_6 = StrOption(name='leader', doc='leader', multi=True) -option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'})) +option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue('valfill')})), properties=frozenset({'normal'})) option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'})) option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8], properties=frozenset({'normal'})) option_4 = OptionDescription(name='general1', doc='general1', children=[option_5], properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10load_leadership_description/tiramisu/base.py b/tests/dictionaries/10load_leadership_description/tiramisu/base.py index d3c6d2ca7..a2fed9384 100644 --- a/tests/dictionaries/10load_leadership_description/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_description/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_6 = StrOption(name='leader', doc='leader', multi=True) -option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'})) +option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue('valfill')})), properties=frozenset({'normal'})) option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'})) option_5 = Leadership(name='leader', doc='other description', children=[option_6, option_7, option_8], properties=frozenset({'normal'})) option_4 = OptionDescription(name='general1', doc='general1', children=[option_5], properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10load_leadership_name/tiramisu/base.py b/tests/dictionaries/10load_leadership_name/tiramisu/base.py index fd408df7e..413730203 100644 --- a/tests/dictionaries/10load_leadership_name/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_name/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_6 = StrOption(name='leader', doc='leader', multi=True) -option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'})) +option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue('valfill')})), properties=frozenset({'normal'})) option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'})) option_5 = Leadership(name='other_name', doc='other_name', children=[option_6, option_7, option_8], properties=frozenset({'normal'})) option_4 = OptionDescription(name='general1', doc='general1', children=[option_5], properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py b/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py index c4561165d..bb6e37ec8 100644 --- a/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_6 = StrOption(name='leader', doc='leader', multi=True) -option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'})) +option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue('valfill')})), properties=frozenset({'normal'})) option_8 = StrOption(name='follower2', doc='follower2', multi=submulti, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)))), properties=frozenset({'normal'})) option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8], properties=frozenset({'normal'})) option_4 = OptionDescription(name='general1', doc='general1', children=[option_5], properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10valid_enum_accent/tiramisu/base.py b/tests/dictionaries/10valid_enum_accent/tiramisu/base.py index 0e276caff..0a9c3a87b 100644 --- a/tests/dictionaries/10valid_enum_accent/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_accent/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) option_5 = ChoiceOption(name='enumvar', doc='multi', values=('a', 'b', 'c', 'é'), default='c', properties=frozenset({'expert', 'mandatory'})) -option_5.impl_set_information("help", "bla bla bla") +option_5.impl_set_information('help', 'bla bla bla') option_4 = OptionDescription(name='enumfam', doc='enumfam', children=[option_5], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_base/tiramisu/base.py b/tests/dictionaries/10valid_enum_base/tiramisu/base.py index 090e2cc07..06e94caa3 100644 --- a/tests/dictionaries/10valid_enum_base/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_base/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) option_5 = ChoiceOption(name='enumvar', doc='multi', values=('a', 'b', 'c'), default='c', properties=frozenset({'expert', 'mandatory'})) -option_5.impl_set_information("help", "bla bla bla") +option_5.impl_set_information('help', 'bla bla bla') option_4 = OptionDescription(name='enumfam', doc='enumfam', children=[option_5], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py b/tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py index 518d18108..00a51b7fd 100644 --- a/tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py @@ -16,7 +16,7 @@ option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non' option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) option_5 = ChoiceOption(name='enumvar2', doc='multi', values=('a', 'b', 'c'), default='c', properties=frozenset({'expert', 'mandatory'})) option_6 = ChoiceOption(name='enumvar', doc='multi', values=('a', 'c'), default='c', properties=frozenset({'expert', 'mandatory'})) -option_6.impl_set_information("help", "bla bla bla") +option_6.impl_set_information('help', 'bla bla bla') option_4 = OptionDescription(name='enumfam', doc='enumfam', children=[option_5, option_6], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_none/tiramisu/base.py b/tests/dictionaries/10valid_enum_none/tiramisu/base.py index d0b9c3ae5..c24b7678b 100644 --- a/tests/dictionaries/10valid_enum_none/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_none/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) option_5 = ChoiceOption(name='enumvar', doc='multi', values=('a', 'b', None), default='b', properties=frozenset({'expert', 'mandatory'})) -option_5.impl_set_information("help", "bla bla bla") +option_5.impl_set_information('help', 'bla bla bla') option_4 = OptionDescription(name='enumfam', doc='enumfam', children=[option_5], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_number/tiramisu/base.py b/tests/dictionaries/10valid_enum_number/tiramisu/base.py index 22fd6ea8f..2ab262eec 100644 --- a/tests/dictionaries/10valid_enum_number/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_number/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) option_5 = ChoiceOption(name='enumvar', doc='enumvar', values=(1, 2, 3), default=1, properties=frozenset({'expert', 'mandatory'})) -option_5.impl_set_information("help", "bla bla bla") +option_5.impl_set_information('help', 'bla bla bla') option_4 = OptionDescription(name='enumfam', doc='enumfam', children=[option_5], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py b/tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py index 11809d69e..e67bccb67 100644 --- a/tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) option_5 = ChoiceOption(name='enumvar', doc='enumvar', values=(1, 2, 3), default=3, properties=frozenset({'expert', 'mandatory'})) -option_5.impl_set_information("help", "bla bla bla") +option_5.impl_set_information('help', 'bla bla bla') option_4 = OptionDescription(name='enumfam', doc='enumfam', children=[option_5], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_param_empty/tiramisu/base.py b/tests/dictionaries/10valid_enum_param_empty/tiramisu/base.py index 84c325efd..afe87b8a9 100644 --- a/tests/dictionaries/10valid_enum_param_empty/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_param_empty/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) option_5 = ChoiceOption(name='enumvar', doc='multi', values=(None,), properties=frozenset({'expert', 'mandatory'})) -option_5.impl_set_information("help", "bla bla bla") +option_5.impl_set_information('help', 'bla bla bla') option_4 = OptionDescription(name='enumfam', doc='enumfam', children=[option_5], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_param_empty2/tiramisu/base.py b/tests/dictionaries/10valid_enum_param_empty2/tiramisu/base.py index 84c325efd..afe87b8a9 100644 --- a/tests/dictionaries/10valid_enum_param_empty2/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_param_empty2/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) option_5 = ChoiceOption(name='enumvar', doc='multi', values=(None,), properties=frozenset({'expert', 'mandatory'})) -option_5.impl_set_information("help", "bla bla bla") +option_5.impl_set_information('help', 'bla bla bla') option_4 = OptionDescription(name='enumfam', doc='enumfam', children=[option_5], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py index 5388fbecb..908ccab39 100644 --- a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py @@ -27,6 +27,6 @@ option_16 = BoolOption(name='activate', doc='activate', default=True, properties option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) -option_7.impl_set_information("manage", True) +option_7.impl_set_information('manage', True) option_6 = OptionDescription(name='services', doc='services', children=[option_7], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py index 0dc05afaa..6839633cb 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py @@ -27,6 +27,6 @@ option_16 = BoolOption(name='activate', doc='activate', default=True, properties option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) -option_7.impl_set_information("manage", True) +option_7.impl_set_information('manage', True) option_6 = OptionDescription(name='services', doc='services', children=[option_7], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py index 5b1144ee6..ddd1a2c48 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py @@ -35,6 +35,6 @@ option_24 = BoolOption(name='activate', doc='activate', default=True, properties option_17 = OptionDescription(name='file2', doc='file2', children=[option_18, option_19, option_20, option_21, option_22, option_23, option_24]) option_8 = OptionDescription(name='files', doc='files', children=[option_9, option_17]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) -option_7.impl_set_information("manage", True) +option_7.impl_set_information('manage', True) option_6 = OptionDescription(name='services', doc='services', children=[option_7], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py b/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py index 2adfb26bc..e91f0bb65 100644 --- a/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py +++ b/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py @@ -27,6 +27,6 @@ option_16 = BoolOption(name='activate', doc='activate', default=True, properties option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) -option_7.impl_set_information("manage", True) +option_7.impl_set_information('manage', True) option_6 = OptionDescription(name='services', doc='services', children=[option_7], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py index 2adfb26bc..e91f0bb65 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py @@ -27,6 +27,6 @@ option_16 = BoolOption(name='activate', doc='activate', default=True, properties option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) -option_7.impl_set_information("manage", True) +option_7.impl_set_information('manage', True) option_6 = OptionDescription(name='services', doc='services', children=[option_7], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py index 52af09211..23305597a 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py @@ -27,6 +27,6 @@ option_16 = BoolOption(name='activate', doc='activate', default=True, properties option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) -option_7.impl_set_information("manage", True) +option_7.impl_set_information('manage', True) option_6 = OptionDescription(name='services', doc='services', children=[option_7], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py index 31073be8d..dc900f3fb 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py @@ -27,6 +27,6 @@ option_16 = BoolOption(name='activate', doc='activate', default=True, properties option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) -option_7.impl_set_information("manage", True) +option_7.impl_set_information('manage', True) option_6 = OptionDescription(name='services', doc='services', children=[option_7], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py b/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py index 1d9b46f4c..5a3b110b8 100644 --- a/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py +++ b/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py @@ -26,6 +26,6 @@ option_15 = BoolOption(name='activate', doc='activate', default=True, properties option_8 = OptionDescription(name='file1', doc='file1', children=[option_9, option_10, option_11, option_12, option_13, option_14, option_15]) option_7 = OptionDescription(name='files', doc='files', children=[option_8]) option_6 = OptionDescription(name='test', doc='test', children=[option_7]) -option_6.impl_set_information("manage", True) +option_6.impl_set_information('manage', True) option_5 = OptionDescription(name='services', doc='services', children=[option_6], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5]) diff --git a/tests/dictionaries/20notemplating/tiramisu/base.py b/tests/dictionaries/20notemplating/tiramisu/base.py index 33577d5ed..f1708417b 100644 --- a/tests/dictionaries/20notemplating/tiramisu/base.py +++ b/tests/dictionaries/20notemplating/tiramisu/base.py @@ -25,6 +25,6 @@ option_14 = BoolOption(name='activate', doc='activate', default=True) option_7 = OptionDescription(name='file', doc='file', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14]) option_6 = OptionDescription(name='files', doc='files', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) -option_5.impl_set_information("manage", True) +option_5.impl_set_information('manage', True) option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/20override/tiramisu/base.py b/tests/dictionaries/20override/tiramisu/base.py index 8bcfe5f4c..40561ae9c 100644 --- a/tests/dictionaries/20override/tiramisu/base.py +++ b/tests/dictionaries/20override/tiramisu/base.py @@ -25,6 +25,6 @@ option_14 = BoolOption(name='activate', doc='activate', default=True) option_7 = OptionDescription(name='test_service', doc='test.service', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14]) option_6 = OptionDescription(name='overrides', doc='overrides', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) -option_5.impl_set_information("manage", True) +option_5.impl_set_information('manage', True) option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py b/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py index a9871be07..2e1aaebc2 100644 --- a/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("value")))), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue('value')))), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) 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/30mandatory_withvaluecalc/tiramisu/base.py b/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py index 111cc2550..2f9cb7ec1 100644 --- a/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("value")))), properties=frozenset({'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue('value')))), properties=frozenset({'normal'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) 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/40empty_param/tiramisu/base.py b/tests/dictionaries/40empty_param/tiramisu/base.py index 9befd9c6c..91a29a76d 100644 --- a/tests/dictionaries/40empty_param/tiramisu/base.py +++ b/tests/dictionaries/40empty_param/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = PortOption(name='toto1', doc='Port d\'écoute du proxy', default=Calculation(func.calc_multi_condition, Params((ParamValue("None")))), allow_private=True, properties=frozenset({'expert'})) +option_3 = PortOption(name='toto1', doc='Port d\'écoute du proxy', default=Calculation(func.calc_multi_condition, Params((ParamValue(None)))), allow_private=True, properties=frozenset({'expert'})) option_4 = PortOption(name='toto2', doc='Port d\'écoute du proxy NTLM', default='3127', allow_private=True, properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='proxy_authentifie', doc='proxy authentifié', children=[option_3, option_4], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/dictionaries/40empty_param2/tiramisu/base.py b/tests/dictionaries/40empty_param2/tiramisu/base.py index 279d1ff2b..cd26704c0 100644 --- a/tests/dictionaries/40empty_param2/tiramisu/base.py +++ b/tests/dictionaries/40empty_param2/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = PortOption(name='toto1', doc='Port d\'écoute du proxy', default=Calculation(func.calc_multi_condition, Params((), kwargs={'value': ParamValue("None")})), allow_private=True, properties=frozenset({'expert'})) +option_3 = PortOption(name='toto1', doc='Port d\'écoute du proxy', default=Calculation(func.calc_multi_condition, Params((), kwargs={'value': ParamValue(None)})), allow_private=True, properties=frozenset({'expert'})) option_4 = PortOption(name='toto2', doc='Port d\'écoute du proxy NTLM', default='3127', allow_private=True, properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='proxy_authentifie', doc='proxy authentifié', children=[option_3, option_4], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py b/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py index 66d6c1d60..1d9bdc9d7 100644 --- a/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='condition', doc='condition', default='oui', properties=frozenset({'mandatory', 'normal'})) option_6 = StrOption(name='leader', doc='leader', multi=True, default=['a'], properties=frozenset({'mandatory'})) -option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) +option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue('valfill')})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) option_8 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'normal'})) option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8], properties=frozenset({'normal'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) @@ -30,6 +30,6 @@ option_19 = BoolOption(name='activate', doc='activate', default=True) option_12 = OptionDescription(name='mailname', doc='mailname', children=[option_13, option_14, option_15, option_16, option_17, option_18, option_19]) option_11 = OptionDescription(name='files', doc='files', children=[option_12]) option_10 = OptionDescription(name='test', doc='test', children=[option_11]) -option_10.impl_set_information("manage", True) +option_10.impl_set_information('manage', True) option_9 = OptionDescription(name='services', doc='services', children=[option_10], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_9]) diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py index 4a689b121..967dbbb73 100644 --- a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='condition', doc='condition', default='oui', properties=frozenset({'mandatory', 'normal'})) option_6 = StrOption(name='leader', doc='leader', multi=True, default=['a', 'b'], properties=frozenset({'mandatory'})) -option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True), 'expected': ParamValue('a')}))})) +option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue('valfill')})), properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True), 'expected': ParamValue('a')}))})) option_8 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'normal'})) option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8], properties=frozenset({'normal'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) @@ -30,6 +30,6 @@ option_19 = BoolOption(name='activate', doc='activate', default=True) option_12 = OptionDescription(name='mailname', doc='mailname', children=[option_13, option_14, option_15, option_16, option_17, option_18, option_19]) option_11 = OptionDescription(name='files', doc='files', children=[option_12]) option_10 = OptionDescription(name='test', doc='test', children=[option_11]) -option_10.impl_set_information("manage", True) +option_10.impl_set_information('manage', True) option_9 = OptionDescription(name='services', doc='services', children=[option_10], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_9]) diff --git a/tests/dictionaries/51redefine_auto/tiramisu/base.py b/tests/dictionaries/51redefine_auto/tiramisu/base.py index ff8315716..0c2ae5344 100644 --- a/tests/dictionaries/51redefine_auto/tiramisu/base.py +++ b/tests/dictionaries/51redefine_auto/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue('non')})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) 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/51redefine_autofill/tiramisu/base.py b/tests/dictionaries/51redefine_autofill/tiramisu/base.py index 9a9b2536e..eb67ca3ec 100644 --- a/tests/dictionaries/51redefine_autofill/tiramisu/base.py +++ b/tests/dictionaries/51redefine_autofill/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue('non')})), properties=frozenset({'normal'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) 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/51redefine_fill/tiramisu/base.py b/tests/dictionaries/51redefine_fill/tiramisu/base.py index ff8315716..0c2ae5344 100644 --- a/tests/dictionaries/51redefine_fill/tiramisu/base.py +++ b/tests/dictionaries/51redefine_fill/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue('non')})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) 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/51redefine_fillauto/tiramisu/base.py b/tests/dictionaries/51redefine_fillauto/tiramisu/base.py index ff8315716..0c2ae5344 100644 --- a/tests/dictionaries/51redefine_fillauto/tiramisu/base.py +++ b/tests/dictionaries/51redefine_fillauto/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue('non')})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) 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/51redefine_help/tiramisu/base.py b/tests/dictionaries/51redefine_help/tiramisu/base.py index bf3af98ba..568fa772e 100644 --- a/tests/dictionaries/51redefine_help/tiramisu/base.py +++ b/tests/dictionaries/51redefine_help/tiramisu/base.py @@ -13,8 +13,8 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='redefine help', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_3.impl_set_information("help", "redefine help ok") +option_3.impl_set_information('help', 'redefine help ok') option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) -option_2.impl_set_information("help", "redefine help family ok") +option_2.impl_set_information('help', 'redefine help family ok') 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/60action_external/tiramisu/base.py b/tests/dictionaries/60action_external/tiramisu/base.py index c38ec5055..562f245fb 100644 --- a/tests/dictionaries/60action_external/tiramisu/base.py +++ b/tests/dictionaries/60action_external/tiramisu/base.py @@ -16,7 +16,7 @@ option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non' option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_6 = IntOption(name='delay', doc='délai en minutes avant lancement', default=0, properties=frozenset({'mandatory', 'normal'})) -option_7 = URLOption(name='calc_url', doc='domain', default=Calculation(func.calc_val, Params((ParamValue("http://localhost/")))), allow_ip=True, allow_without_dot=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_7 = URLOption(name='calc_url', doc='domain', default=Calculation(func.calc_val, Params((ParamValue('http://localhost/')))), allow_ip=True, allow_without_dot=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_5 = OptionDescription(name='test', doc='test', children=[option_6, option_7], properties=frozenset({'normal'})) option_4 = OptionDescription(name='extra', doc='extra', children=[option_5]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/60extra_group/tiramisu/base.py b/tests/dictionaries/60extra_group/tiramisu/base.py index d3689b91a..aa094ce23 100644 --- a/tests/dictionaries/60extra_group/tiramisu/base.py +++ b/tests/dictionaries/60extra_group/tiramisu/base.py @@ -31,6 +31,6 @@ option_20 = BoolOption(name='activate', doc='activate', default=True) option_13 = OptionDescription(name='mailname', doc='mailname', children=[option_14, option_15, option_16, option_17, option_18, option_19, option_20]) option_12 = OptionDescription(name='files', doc='files', children=[option_13]) option_11 = OptionDescription(name='test', doc='test', children=[option_12]) -option_11.impl_set_information("manage", True) +option_11.impl_set_information('manage', True) option_10 = OptionDescription(name='services', doc='services', children=[option_11], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5, option_10]) diff --git a/tests/dictionaries/60extra_help/tiramisu/base.py b/tests/dictionaries/60extra_help/tiramisu/base.py index 3de4292c2..22e8547d8 100644 --- a/tests/dictionaries/60extra_help/tiramisu/base.py +++ b/tests/dictionaries/60extra_help/tiramisu/base.py @@ -17,8 +17,8 @@ option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', pr option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_7 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', properties=frozenset({'mandatory', 'normal'})) -option_8 = ChoiceOption(name='day', doc='day', values=('none', 'daily', 'weekly', 'monthly'), 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")})), properties=frozenset({'mandatory', 'normal'})) -option_8.impl_set_information("help", "Test help") +option_8 = ChoiceOption(name='day', doc='day', values=('none', 'daily', 'weekly', 'monthly'), 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')})), properties=frozenset({'mandatory', 'normal'})) +option_8.impl_set_information('help', 'Test help') option_9 = ChoiceOption(name='mode', doc='mode', values=('pre', 'post'), default='pre', properties=frozenset({'mandatory', 'normal'})) option_6 = OptionDescription(name='ejabberd', doc='ejabberd', children=[option_7, option_8, option_9], properties=frozenset({'normal'})) option_5 = OptionDescription(name='extra', doc='extra', children=[option_6]) @@ -32,6 +32,6 @@ option_20 = BoolOption(name='activate', doc='activate', default=True) option_13 = OptionDescription(name='mailname', doc='mailname', children=[option_14, option_15, option_16, option_17, option_18, option_19, option_20]) option_12 = OptionDescription(name='files', doc='files', children=[option_13]) option_11 = OptionDescription(name='test', doc='test', children=[option_12]) -option_11.impl_set_information("manage", True) +option_11.impl_set_information('manage', True) option_10 = OptionDescription(name='services', doc='services', children=[option_11], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5, option_10]) diff --git a/tests/dictionaries/60extra_load/tiramisu/base.py b/tests/dictionaries/60extra_load/tiramisu/base.py index 82066d828..4da01b8d5 100644 --- a/tests/dictionaries/60extra_load/tiramisu/base.py +++ b/tests/dictionaries/60extra_load/tiramisu/base.py @@ -17,7 +17,7 @@ option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', pr option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_7 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', properties=frozenset({'mandatory', 'normal'})) -option_8 = ChoiceOption(name='day', doc='day', values=('none', 'daily', 'weekly', 'monthly'), 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")})), properties=frozenset({'mandatory', 'normal'})) +option_8 = ChoiceOption(name='day', doc='day', values=('none', 'daily', 'weekly', 'monthly'), 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')})), properties=frozenset({'mandatory', 'normal'})) option_9 = ChoiceOption(name='mode', doc='mode', values=('pre', 'post'), default='pre', properties=frozenset({'mandatory', 'normal'})) option_6 = OptionDescription(name='ejabberd', doc='ejabberd', children=[option_7, option_8, option_9], properties=frozenset({'normal'})) option_5 = OptionDescription(name='extra', doc='extra', children=[option_6]) diff --git a/tests/dictionaries/60extra_mandatory/tiramisu/base.py b/tests/dictionaries/60extra_mandatory/tiramisu/base.py index 45e333528..a5035d4d4 100644 --- a/tests/dictionaries/60extra_mandatory/tiramisu/base.py +++ b/tests/dictionaries/60extra_mandatory/tiramisu/base.py @@ -17,7 +17,7 @@ option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', pr option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_7 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', properties=frozenset({'mandatory', 'normal'})) -option_8 = ChoiceOption(name='day', doc='day', values=('none', 'daily', 'weekly', 'monthly'), 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")})), properties=frozenset({'mandatory', 'normal'})) +option_8 = ChoiceOption(name='day', doc='day', values=('none', 'daily', 'weekly', 'monthly'), 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')})), properties=frozenset({'mandatory', 'normal'})) option_9 = ChoiceOption(name='mode', doc='mode', values=('pre', 'post'), default='pre', properties=frozenset({'mandatory', 'normal'})) option_10 = StrOption(name='var1', doc='var1', properties=frozenset({'basic', 'mandatory'})) option_6 = OptionDescription(name='ejabberd', doc='ejabberd', children=[option_7, option_8, option_9, option_10], properties=frozenset({'basic'})) diff --git a/tests/dictionaries/60extra_name_family/tiramisu/base.py b/tests/dictionaries/60extra_name_family/tiramisu/base.py index ad668fd0a..87bdc6545 100644 --- a/tests/dictionaries/60extra_name_family/tiramisu/base.py +++ b/tests/dictionaries/60extra_name_family/tiramisu/base.py @@ -17,7 +17,7 @@ option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', pr option_2 = OptionDescription(name='extra', doc='extra', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_7 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', properties=frozenset({'mandatory', 'normal'})) -option_8 = ChoiceOption(name='day', doc='day', values=('none', 'daily', 'weekly', 'monthly'), 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")})), properties=frozenset({'mandatory', 'normal'})) +option_8 = ChoiceOption(name='day', doc='day', values=('none', 'daily', 'weekly', 'monthly'), 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')})), properties=frozenset({'mandatory', 'normal'})) option_9 = ChoiceOption(name='mode', doc='mode', values=('pre', 'post'), default='pre', properties=frozenset({'mandatory', 'normal'})) option_6 = OptionDescription(name='ejabberd', doc='ejabberd', children=[option_7, option_8, option_9], properties=frozenset({'normal'})) option_5 = OptionDescription(name='extra', doc='extra', children=[option_6]) diff --git a/tests/dictionaries/60extra_redefine/tiramisu/base.py b/tests/dictionaries/60extra_redefine/tiramisu/base.py index 4783a5fd9..8bff0cc41 100644 --- a/tests/dictionaries/60extra_redefine/tiramisu/base.py +++ b/tests/dictionaries/60extra_redefine/tiramisu/base.py @@ -17,7 +17,7 @@ option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', pr option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_7 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_8 = ChoiceOption(name='day', doc='day', values=('none', 'daily', 'weekly', 'monthly'), 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")})), properties=frozenset({'mandatory', 'normal'})) +option_8 = ChoiceOption(name='day', doc='day', values=('none', 'daily', 'weekly', 'monthly'), 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')})), properties=frozenset({'mandatory', 'normal'})) option_9 = ChoiceOption(name='mode', doc='mode', values=('pre', 'post'), default='pre', properties=frozenset({'mandatory', 'normal'})) option_6 = OptionDescription(name='ejabberd', doc='ejabberd', children=[option_7, option_8, option_9], properties=frozenset({'normal'})) option_5 = OptionDescription(name='extra', doc='extra', children=[option_6]) diff --git a/tests/dictionaries/70container_files/tiramisu/base.py b/tests/dictionaries/70container_files/tiramisu/base.py index 2da9e578d..95caa087b 100644 --- a/tests/dictionaries/70container_files/tiramisu/base.py +++ b/tests/dictionaries/70container_files/tiramisu/base.py @@ -33,6 +33,6 @@ option_22 = BoolOption(name='activate', doc='activate', default=True) option_15 = OptionDescription(name='rougail_conf', doc='rougail.conf', children=[option_16, option_17, option_18, option_19, option_20, option_21, option_22]) option_6 = OptionDescription(name='files', doc='files', children=[option_7, option_15]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) -option_5.impl_set_information("manage", True) +option_5.impl_set_information('manage', True) option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py b/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py index ad7e57328..98a15e326 100644 --- a/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py +++ b/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py @@ -26,6 +26,6 @@ option_15 = BoolOption(name='activate', doc='activate', default=True) option_8 = OptionDescription(name='mailname', doc='mailname', children=[option_9, option_10, option_11, option_12, option_13, option_14, option_15]) option_7 = OptionDescription(name='files', doc='files', children=[option_8]) option_6 = OptionDescription(name='test', doc='test', children=[option_7]) -option_6.impl_set_information("manage", True) +option_6.impl_set_information('manage', True) option_5 = OptionDescription(name='services', doc='services', children=[option_6], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5]) diff --git a/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py b/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py index 48389ca57..348936dd8 100644 --- a/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py +++ b/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py @@ -28,6 +28,6 @@ option_17 = BoolOption(name='activate', doc='activate', default=True) option_9 = OptionDescription(name='mailname', doc='mailname', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) -option_7.impl_set_information("manage", True) +option_7.impl_set_information('manage', True) option_6 = OptionDescription(name='services', doc='services', children=[option_7], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/dictionaries/70container_files_symlink_variable/tiramisu/base.py b/tests/dictionaries/70container_files_symlink_variable/tiramisu/base.py index 59e93d28e..aa9e65d2a 100644 --- a/tests/dictionaries/70container_files_symlink_variable/tiramisu/base.py +++ b/tests/dictionaries/70container_files_symlink_variable/tiramisu/base.py @@ -28,6 +28,6 @@ option_17 = BoolOption(name='activate', doc='activate', default=True) option_9 = OptionDescription(name='mailname', doc='mailname', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) -option_7.impl_set_information("manage", True) +option_7.impl_set_information('manage', True) option_6 = OptionDescription(name='services', doc='services', children=[option_7], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/dictionaries/70container_files_twice/tiramisu/base.py b/tests/dictionaries/70container_files_twice/tiramisu/base.py index f8ce4414f..014b31a6d 100644 --- a/tests/dictionaries/70container_files_twice/tiramisu/base.py +++ b/tests/dictionaries/70container_files_twice/tiramisu/base.py @@ -41,6 +41,6 @@ option_30 = BoolOption(name='activate', doc='activate', default=True) option_23 = OptionDescription(name='rougail_conf', doc='rougail.conf', children=[option_24, option_25, option_26, option_27, option_28, option_29, option_30]) option_6 = OptionDescription(name='files', doc='files', children=[option_7, option_15, option_23]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) -option_5.impl_set_information("manage", True) +option_5.impl_set_information('manage', True) option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_filesmulti/tiramisu/base.py b/tests/dictionaries/70container_filesmulti/tiramisu/base.py index 30afa6aa2..1448eca58 100644 --- a/tests/dictionaries/70container_filesmulti/tiramisu/base.py +++ b/tests/dictionaries/70container_filesmulti/tiramisu/base.py @@ -33,6 +33,6 @@ option_22 = BoolOption(name='activate', doc='activate', default=True) option_15 = OptionDescription(name='mailname2', doc='mailname2', children=[option_16, option_17, option_18, option_19, option_20, option_21, option_22]) option_6 = OptionDescription(name='files', doc='files', children=[option_7, option_15]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) -option_5.impl_set_information("manage", True) +option_5.impl_set_information('manage', True) option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_filesredefine/tiramisu/base.py b/tests/dictionaries/70container_filesredefine/tiramisu/base.py index e31a2df0a..8593ce4b8 100644 --- a/tests/dictionaries/70container_filesredefine/tiramisu/base.py +++ b/tests/dictionaries/70container_filesredefine/tiramisu/base.py @@ -25,6 +25,6 @@ option_14 = BoolOption(name='activate', doc='activate', default=True) option_7 = OptionDescription(name='mailname_new', doc='mailname.new', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14]) option_6 = OptionDescription(name='files', doc='files', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) -option_5.impl_set_information("manage", True) +option_5.impl_set_information('manage', True) option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_new/tiramisu/base.py b/tests/dictionaries/70container_new/tiramisu/base.py index 4d646159a..499522d5d 100644 --- a/tests/dictionaries/70container_new/tiramisu/base.py +++ b/tests/dictionaries/70container_new/tiramisu/base.py @@ -16,6 +16,6 @@ option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui' option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_5 = OptionDescription(name='test', doc='test', children=[]) -option_5.impl_set_information("manage", True) +option_5.impl_set_information('manage', True) option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_newnocont/tiramisu/base.py b/tests/dictionaries/70container_newnocont/tiramisu/base.py index 955d072d9..a159a16a3 100644 --- a/tests/dictionaries/70container_newnocont/tiramisu/base.py +++ b/tests/dictionaries/70container_newnocont/tiramisu/base.py @@ -16,6 +16,6 @@ option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non' option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_5 = OptionDescription(name='test', doc='test', children=[]) -option_5.impl_set_information("manage", True) +option_5.impl_set_information('manage', True) option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_newwithip/tiramisu/base.py b/tests/dictionaries/70container_newwithip/tiramisu/base.py index b8d0073d1..d4ba7bbe3 100644 --- a/tests/dictionaries/70container_newwithip/tiramisu/base.py +++ b/tests/dictionaries/70container_newwithip/tiramisu/base.py @@ -17,6 +17,6 @@ option_4 = IPOption(name='adresse_ip_test', doc='No change', allow_reserved=True option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_6 = OptionDescription(name='test', doc='test', children=[]) -option_6.impl_set_information("manage", True) +option_6.impl_set_information('manage', True) option_5 = OptionDescription(name='services', doc='services', children=[option_6], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5]) diff --git a/tests/dictionaries/70container_pathaccess/tiramisu/base.py b/tests/dictionaries/70container_pathaccess/tiramisu/base.py index b99118000..f86f066a3 100644 --- a/tests/dictionaries/70container_pathaccess/tiramisu/base.py +++ b/tests/dictionaries/70container_pathaccess/tiramisu/base.py @@ -24,6 +24,6 @@ option_13 = BoolOption(name='activate', doc='activate', default=True) option_9 = OptionDescription(name='nut_monitor_host', doc='nut_monitor_host', children=[option_10, option_11, option_12, option_13]) option_8 = OptionDescription(name='ips', doc='ips', children=[option_9]) option_7 = OptionDescription(name='nut', doc='nut', children=[option_8]) -option_7.impl_set_information("manage", True) +option_7.impl_set_information('manage', True) option_6 = OptionDescription(name='services', doc='services', children=[option_7], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/dictionaries/70container_pathaccess_leadership/tiramisu/base.py b/tests/dictionaries/70container_pathaccess_leadership/tiramisu/base.py index 4335d7e1c..3c97847c2 100644 --- a/tests/dictionaries/70container_pathaccess_leadership/tiramisu/base.py +++ b/tests/dictionaries/70container_pathaccess_leadership/tiramisu/base.py @@ -25,6 +25,6 @@ option_14 = BoolOption(name='activate', doc='activate', default=True) option_10 = OptionDescription(name='nut_monitor_host', doc='nut_monitor_host', children=[option_11, option_12, option_13, option_14]) option_9 = OptionDescription(name='ips', doc='ips', children=[option_10]) option_8 = OptionDescription(name='ntp', doc='ntp', children=[option_9]) -option_8.impl_set_information("manage", True) +option_8.impl_set_information('manage', True) option_7 = OptionDescription(name='services', doc='services', children=[option_8], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_7]) diff --git a/tests/dictionaries/70container_serviceaccess/tiramisu/base.py b/tests/dictionaries/70container_serviceaccess/tiramisu/base.py index 08e83586f..4f8af3e34 100644 --- a/tests/dictionaries/70container_serviceaccess/tiramisu/base.py +++ b/tests/dictionaries/70container_serviceaccess/tiramisu/base.py @@ -21,6 +21,6 @@ option_10 = BoolOption(name='activate', doc='activate', default=True) option_7 = OptionDescription(name='123', doc='123', children=[option_8, option_9, option_10]) option_6 = OptionDescription(name='ports', doc='ports', children=[option_7]) option_5 = OptionDescription(name='ntp', doc='ntp', children=[option_6]) -option_5.impl_set_information("manage", True) +option_5.impl_set_information('manage', True) option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_servicerestriction/tiramisu/base.py b/tests/dictionaries/70container_servicerestriction/tiramisu/base.py index 7520904dd..a65f553d8 100644 --- a/tests/dictionaries/70container_servicerestriction/tiramisu/base.py +++ b/tests/dictionaries/70container_servicerestriction/tiramisu/base.py @@ -22,6 +22,6 @@ option_11 = BoolOption(name='activate', doc='activate', default=True) option_7 = OptionDescription(name='192_168_1_1', doc='192.168.1.1', children=[option_8, option_9, option_10, option_11]) option_6 = OptionDescription(name='ips', doc='ips', children=[option_7]) option_5 = OptionDescription(name='testsrv', doc='testsrv', children=[option_6]) -option_5.impl_set_information("manage", True) +option_5.impl_set_information('manage', True) option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_services/tiramisu/base.py b/tests/dictionaries/70container_services/tiramisu/base.py index 73ff89d3a..2b590eba7 100644 --- a/tests/dictionaries/70container_services/tiramisu/base.py +++ b/tests/dictionaries/70container_services/tiramisu/base.py @@ -16,6 +16,6 @@ option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui' option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_5 = OptionDescription(name='testsrv', doc='testsrv', children=[]) -option_5.impl_set_information("manage", True) +option_5.impl_set_information('manage', True) option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/70services_unmanage/tiramisu/base.py b/tests/dictionaries/70services_unmanage/tiramisu/base.py index 1f860a025..bbe3fb16c 100644 --- a/tests/dictionaries/70services_unmanage/tiramisu/base.py +++ b/tests/dictionaries/70services_unmanage/tiramisu/base.py @@ -16,6 +16,6 @@ option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui' option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_5 = OptionDescription(name='testsrv', doc='testsrv', children=[]) -option_5.impl_set_information("manage", False) +option_5.impl_set_information('manage', False) option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4])