From 5add91082f0baa85d21c59d264f4d38768aba53f Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Sun, 28 Mar 2021 15:49:40 +0200 Subject: [PATCH] auto_freeze_variable cannot be force_default_on_freeze --- src/rougail/annotator/property.py | 3 ++- .../51redefine_removecondition_nonautofreeze/tiramisu/base.py | 2 +- .../60extra_externalspacecondition/tiramisu/base.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/rougail/annotator/property.py b/src/rougail/annotator/property.py index 9669d6ba..12a3ee2d 100644 --- a/src/rougail/annotator/property.py +++ b/src/rougail/annotator/property.py @@ -50,7 +50,8 @@ class PropertyAnnotator(Walk): """convert properties """ # hidden variable is also frozen - if isinstance(variable, self.objectspace.variable) and variable.hidden is True: + if isinstance(variable, self.objectspace.variable) and variable.hidden is True and \ + variable.name != self.objectspace.rougailconfig['auto_freeze_variable']: if not variable.auto_freeze: variable.frozen = True if not variable.auto_save and \ diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py index bc4a6466..e1af0ae9 100644 --- a/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py +++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py @@ -11,7 +11,7 @@ try: from tiramisu3 import * except: from tiramisu import * -option_6 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) +option_6 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"hidden", "mandatory", "normal"})) option_2 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_6, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) option_3 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"})) option_4 = StrOption(name="my_var1", doc="my_var1", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) diff --git a/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py b/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py index f6352ae5..f8496f7b 100644 --- a/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py +++ b/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py @@ -11,7 +11,7 @@ try: from tiramisu3 import * except: from tiramisu import * -option_5 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) +option_5 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"hidden", "mandatory", "normal"})) option_3 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_5, todict=True, notraisepropertyerror=True), 'expected': ParamValue(True)}))})) option_4 = StrOption(name="my_var1", doc="my_var1", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4, option_5], properties=frozenset({"basic"}))