remove condition not only a target

src/rougail/annotator.py

@@ -765,6 +765,7 @@ class ConstraintAnnotator:
         if target.type == 'variable':
             variable = self.objectspace.paths.get_variable_obj(target.name)
             family = self.objectspace.paths.get_family_obj(target.name.rsplit('.', 1)[0])
+            # it's a leader, so apply property to leadership
             if isinstance(family, self.objectspace.Leadership) and family.name == variable.name:
                 return family, family.variable
             return variable, [variable]
@@ -927,27 +928,28 @@ class ConstraintAnnotator:
             inverse = condition.name.endswith('_if_not_in')
             actions = self._get_condition_actions(condition.name)
             for param in condition.param:
-                if hasattr(param, 'text'):
+                text = getattr(param, 'text', None)
-                    param = param.text
-                else:
-                    param = None
                 for target in condition.target:
                     leader_or_variable, variables = self._get_family_variables_from_target(target)
                     # if option is already disable, do not apply disable_if_in
-                    if hasattr(leader_or_variable, actions[0]) and getattr(leader_or_variable, actions[0]) is True:
+                    # check only the first action (example of multiple actions: 'hidden', 'frozen', 'force_default_on_freeze')
+                    main_action = actions[0]
+                    if getattr(leader_or_variable, main_action, False) is True:
                         continue
                     for idx, action in enumerate(actions):
                         prop = self.objectspace.property_(leader_or_variable.xmlfiles)
                         prop.type = 'calculation'
                         prop.inverse = inverse
                         prop.source = condition.source
-                        prop.expected = param
+                        prop.expected = text
                         prop.name = action
                         if idx == 0:
+                            # main action is for the variable or family
                             if not hasattr(leader_or_variable, 'property'):
                                 leader_or_variable.property = []
                             leader_or_variable.property.append(prop)
                         else:
+                            # other actions are set to the variable or children of family
                             for variable in variables:
                                 if not hasattr(variable, 'property'):
                                     variable.property = []

src/rougail/objspace.py

@@ -441,16 +441,12 @@ class CreoleObjSpace:
                 self.space.constraints.check.pop(idx)  # pylint: disable=E1101
 
     def remove_condition(self, name):  # pylint: disable=C0111
+        remove_conditions = []
         for idx, condition in enumerate(self.space.constraints.condition):  # pylint: disable=E1101
-            remove_targets = []
+            if condition.source == name:
-            if hasattr(condition, 'target'):
+                remove_conditions.append(idx)
-                for target_idx, target in enumerate(condition.target):
+        for idx in remove_conditions:
-                    if target.name == name:
+            del self.space.constraints.condition[idx]
-                        remove_targets.append(target_idx)
-            remove_targets = list(set(remove_targets))
-            remove_targets.sort(reverse=True)
-            for idx in remove_targets:
-                del condition.target[idx]
 
     def add_to_tree_structure(self,
                               variableobj,

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

@@ -26,7 +26,7 @@
             <param type="variable">mode_conteneur_actif1</param>
         </check>
         <check name="valid_differ" target="mode_conteneur_actif3">
-            <param type="variable">mode_conteneur_actif2</param>
+            <param type="variable">mode_conteneur_actif1</param>
         </check>
     </constraints>
 

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

@@ -5,9 +5,7 @@
 
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif3" redefine="True">
+            <variable name="mode_conteneur_actif3" redefine="True"/>
-                <value>oui</value>
-            </variable>
         </family>
         <separators/>
     </variables>

tests/dictionaries/40condition_base_add/00-base.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
             <variable name="mode_conteneur_actif" type="oui/non" description="No change">
@@ -11,26 +8,22 @@
             <variable name="condition" type="oui/non" description="No change">
                 <value>non</value>
             </variable>
-            <variable name="mode_conteneur_actif1" type="oui/non" description="No change" hidden="True">
+            <variable name="mode_conteneur_actif1" type="oui/non" description="No change">
                 <value>non</value>
             </variable>
-            <variable name="mode_conteneur_actif2" type="oui/non" description="No change" hidden="True">
+            <variable name="mode_conteneur_actif2" type="oui/non" description="No change">
                 <value>non</value>
             </variable>
         </family>
-        <separators/>
     </variables>
 
     <constraints>
-        <condition name="disabled_if_in" source="condition">
+        <condition fallback="True" name="disabled_if_in" source="condition">
             <param>oui</param>
             <target type="variable">mode_conteneur_actif1</target>
-            <target type="variable">mode_conteneur_actif2</target>
+            <target type="variable" optional="True">mode_conteneur_actif2</target>
         </condition>
     </constraints>
-
-    <help/>
-
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
 -->

tests/dictionaries/40condition_base_add/01-base.xml

@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail>
+    <variables>
+        <family name="general">
+            <variable name="condition" redefine="True"/>
+        </family>
+    </variables>
+
+    <constraints>
+        <condition fallback="True" name="disabled_if_in" source="condition">
+            <param>oui</param>
+            <target type="variable">mode_conteneur_actif1</target>
+            <target type="variable" optional="True">mode_conteneur_actif2</target>
+        </condition>
+    </constraints>
+
+</rougail>
+<!-- vim: ts=4 sw=4 expandtab
+-->

tests/dictionaries/40condition_base_add/tiramisu/base.py

@@ -10,8 +10,8 @@ except:
 from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non'))
-option_5 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_5 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
-option_6 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_6 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5, option_6])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/51redefine_remove_condition/01-base.xml

@@ -5,7 +5,7 @@
 
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif1" redefine="True" remove_condition="True"/>
+            <variable name="condition" redefine="True" remove_condition="True"/>
         </family>
         <separators/>
     </variables>

tests/dictionaries/51redefine_remove_condition/tiramisu/base.py

@@ -11,7 +11,7 @@ from rougail.tiramisu import ConvertDynOptionDescription
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_5 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
-option_6 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_6 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5, option_6])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/51redefine_removecondition_alltarget/01-base.xml

@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail>
-
-    <services/>
-
-    <variables>
-        <family name="general">
-            <variable name="mode_conteneur_actif1" redefine="True" remove_condition="True"/>
-            <variable name="mode_conteneur_actif2" redefine="True" remove_condition="True"/>
-        </family>
-        <separators/>
-    </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
-</rougail>

tests/dictionaries/51redefine_removecondition_nonautofreeze/01-base.xml

@@ -1,18 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
-
-    <services/>
-
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif1" redefine="True" remove_condition="True"/>
+            <variable name="condition" redefine="True" remove_condition="True"/>
         </family>
-        <separators/>
     </variables>
-
-    <constraints>
-    </constraints>
-
-    <help/>
-
 </rougail>

tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py

@@ -12,7 +12,7 @@ option_7 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen
 option_3 = ChoiceOption(properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_5 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
-option_6 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_6 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3, option_4, option_5, option_6, option_7])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/test_1_flattener.py

@@ -28,7 +28,7 @@ excludes = set([])
 #excludes = set(['01base_file_utfchar'])
 test_ok -= excludes
 test_raise -= excludes
-#test_ok = ['10leadership_autoleader']
+#test_ok = ['40condition_base_add']
 #test_raise = []
 
 ORI_DIR = getcwd()