From b12bf443a6c51f8a9fbb6c9dbb3c15185a30d215 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Tue, 7 Jul 2020 18:33:19 +0200 Subject: [PATCH] frozen_if_ => hidden_if_ --- src/rougail/annotator.py | 28 +++++++++---------- .../10autosave_hidden_frozenifin/00-base.xml | 2 +- .../10load_frozenifin/00-base.xml | 2 +- .../10load_frozenifin_auto/00-base.xml | 2 +- .../10load_frozenifin_multiparam/00-base.xml | 2 +- .../10load_frozenifin_noexist/00-base.xml | 2 +- tests/test_flattener.py | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/rougail/annotator.py b/src/rougail/annotator.py index d329e457..09c7dee3 100644 --- a/src/rougail/annotator.py +++ b/src/rougail/annotator.py @@ -287,7 +287,7 @@ class SpaceAnnotator(object): else: self.eosfunc = None if HIGH_COMPATIBILITY: - self.has_frozen_if_in_condition = [] + self.has_hidden_if_in_condition = [] self.convert_variable() self.convert_auto_freeze() self.convert_groups() @@ -539,7 +539,7 @@ class SpaceAnnotator(object): for variable in family.variable.values(): if variable.auto_freeze: new_condition = self.objectspace.condition() - new_condition.name = 'auto_frozen_if_in' + new_condition.name = 'auto_hidden_if_in' new_condition.namespace = variables.name new_condition.source = FREEZE_AUTOFREEZE_VARIABLE new_param = self.objectspace.param() @@ -994,7 +994,7 @@ class SpaceAnnotator(object): variable.disabled = True if condition.name in ['mandatory_if_in']: variable.mandatory = True - if condition.name in ['frozen_if_in', 'frozen_if_not_in']: + if condition.name in ['hidden_if_in', 'hidden_if_not_in']: variable.hidden = False if HIGH_COMPATIBILITY: fallback_variables.append(name) @@ -1014,7 +1014,7 @@ class SpaceAnnotator(object): variable.disabled = True if condition.name in ['mandatory_if_in']: variable.mandatory = True - if condition.name in ['frozen_if_in', 'frozen_if_not_in']: + if condition.name in ['hidden_if_in', 'hidden_if_not_in']: variable.hidden = False fallback_lists.append(listvar) remove_conditions.append(idx) @@ -1063,8 +1063,8 @@ class SpaceAnnotator(object): # elif condition.name == 'hidden_if_not_in': # condition.name = 'disabled_if_not_in' for condition in self.space.constraints.condition: - if condition.name not in ['disabled_if_in', 'disabled_if_not_in', 'frozen_if_in', 'auto_frozen_if_in', - 'frozen_if_not_in', 'mandatory_if_in', 'mandatory_if_not_in']: + if condition.name not in ['disabled_if_in', 'disabled_if_not_in', 'hidden_if_in', 'auto_hidden_if_in', + 'hidden_if_not_in', 'mandatory_if_in', 'mandatory_if_not_in']: raise CreoleDictConsistencyError(_('unknown condition {}').format(condition.name)) def check_params(self): @@ -1109,7 +1109,7 @@ class SpaceAnnotator(object): variable.disabled = True force_remove_targets.setdefault(condition.name, []).append(target.name) - elif condition.name == 'frozen_if_not_in': + elif condition.name == 'hidden_if_not_in': variable.hidden = True force_remove_targets.setdefault(condition.name, []).append(target.name) @@ -1141,13 +1141,13 @@ class SpaceAnnotator(object): if name in fallback_variables: remove_targets.append(target_idx) continue - if condition.name in ['frozen_if_in', 'frozen_if_not_in']: + if condition.name in ['hidden_if_in', 'hidden_if_not_in']: variable.hidden = False if condition.name in ['mandatory_if_in', 'mandatory_if_not_in']: variable.mandatory = False - if HIGH_COMPATIBILITY and condition.name in ['frozen_if_in', - 'frozen_if_not_in']: - self.has_frozen_if_in_condition.append(name) + if HIGH_COMPATIBILITY and condition.name in ['hidden_if_in', + 'hidden_if_not_in']: + self.has_hidden_if_in_condition.append(name) if condition.name in ['mandatory_if_in', 'mandatory_if_not_in']: self.force_not_mandatory.append(target.name) @@ -1189,10 +1189,10 @@ class SpaceAnnotator(object): elif condition.name == 'disabled_if_not_in': actions = ['disabled'] inverse = True - elif condition.name == 'frozen_if_in': + elif condition.name == 'hidden_if_in': actions = ['frozen', 'hidden', 'force_default_on_freeze'] inverse = False - elif condition.name == 'frozen_if_not_in': + elif condition.name == 'hidden_if_not_in': actions = ['frozen', 'hidden', 'force_default_on_freeze'] inverse = True elif condition.name == 'mandatory_if_in': @@ -1201,7 +1201,7 @@ class SpaceAnnotator(object): elif condition.name == 'mandatory_if_not_in': actions = ['mandatory'] inverse = True - elif condition.name == 'auto_frozen_if_in': + elif condition.name == 'auto_hidden_if_in': actions = ['auto_frozen'] inverse = True for param in condition.param: diff --git a/tests/flattener_dicos/10autosave_hidden_frozenifin/00-base.xml b/tests/flattener_dicos/10autosave_hidden_frozenifin/00-base.xml index 7727824a..825fc8eb 100644 --- a/tests/flattener_dicos/10autosave_hidden_frozenifin/00-base.xml +++ b/tests/flattener_dicos/10autosave_hidden_frozenifin/00-base.xml @@ -16,7 +16,7 @@ oui - + oui autosavevar diff --git a/tests/flattener_dicos/10load_frozenifin/00-base.xml b/tests/flattener_dicos/10load_frozenifin/00-base.xml index dd44ddcd..b2273051 100644 --- a/tests/flattener_dicos/10load_frozenifin/00-base.xml +++ b/tests/flattener_dicos/10load_frozenifin/00-base.xml @@ -19,7 +19,7 @@ - + oui mode_conteneur_actif mode_conteneur_actif2 diff --git a/tests/flattener_dicos/10load_frozenifin_auto/00-base.xml b/tests/flattener_dicos/10load_frozenifin_auto/00-base.xml index 26482028..19e1647f 100644 --- a/tests/flattener_dicos/10load_frozenifin_auto/00-base.xml +++ b/tests/flattener_dicos/10load_frozenifin_auto/00-base.xml @@ -19,7 +19,7 @@ - + oui mode_conteneur_actif mode_conteneur_actif2 diff --git a/tests/flattener_dicos/10load_frozenifin_multiparam/00-base.xml b/tests/flattener_dicos/10load_frozenifin_multiparam/00-base.xml index c8794970..47d03383 100644 --- a/tests/flattener_dicos/10load_frozenifin_multiparam/00-base.xml +++ b/tests/flattener_dicos/10load_frozenifin_multiparam/00-base.xml @@ -22,7 +22,7 @@ ['tous', 'authentifié', 'aucun'] - + tous authentifié mode_conteneur_actif diff --git a/tests/flattener_dicos/10load_frozenifin_noexist/00-base.xml b/tests/flattener_dicos/10load_frozenifin_noexist/00-base.xml index dac0e680..60c371d3 100644 --- a/tests/flattener_dicos/10load_frozenifin_noexist/00-base.xml +++ b/tests/flattener_dicos/10load_frozenifin_noexist/00-base.xml @@ -21,7 +21,7 @@ ['tous', 'authentifié', 'aucun'] - + oui non mode_conteneur_actif diff --git a/tests/test_flattener.py b/tests/test_flattener.py index 3c773e9c..b921909b 100644 --- a/tests/test_flattener.py +++ b/tests/test_flattener.py @@ -84,7 +84,7 @@ def launch_flattener(test_dir, test_ok=False): eolobj.save(destfile) result_file = join(test_dir, 'result/00-base.xml') if isfile(result_file): - eolobj.save(result_file) + #eolobj.save(result_file) compare_xml(destfile, result_file) elif test_ok: raise Exception(f'no test found for {test_dir}')