Optimise XML tree analysis (thanks to Nicolas Delaby)

master/bt5/vifib_base/DocumentTemplateItem/SoftwareInstance.py

@@ -51,13 +51,12 @@ class SoftwareInstance(Item):
     xml = self.getSlaXml()
     if xml is not None and xml != '':
       tree = etree.fromstring(xml.encode('utf-8'))
-      for element in tree.iter(tag=etree.Element):
-        if element.tag == 'parameter':
-          key = element.get('id')
-          value = result_dict.get(key, None)
-          if value is not None:
-            value = value + ' ' + element.text
-          else:
-            value = element.text
-          result_dict[key] = value
+      for element in tree.findall('parameter'):
+        key = element.get('id')
+        value = result_dict.get(key, None)
+        if value is not None:
+          value = value + ' ' + element.text
+        else:
+          value = element.text
+        result_dict[key] = value
     return result_dict

master/bt5/vifib_base/bt/revision

-241
\ No newline at end of file
+242
\ No newline at end of file

master/product/Vifib/Tool/SlapTool.py

@@ -346,15 +346,14 @@ class SlapTool(BaseTool):
     result_dict = {}
     if xml is not None and xml != '':
       tree = etree.fromstring(xml.encode('utf-8'))
-      for element in tree.iter(tag=etree.Element):
-        if element.tag == 'parameter':
-          key = element.get('id')
-          value = result_dict.get(key, None)
-          if value is not None:
-            value = value + ' ' + element.text
-          else:
-            value = element.text
-          result_dict[key] = value
+      for element in tree.findall('parameter'):
+        key = element.get('id')
+        value = result_dict.get(key, None)
+        if value is not None:
+          value = value + ' ' + element.text
+        else:
+          value = element.text
+        result_dict[key] = value
     return result_dict
 
   def _getModificationStatusForSlave(self, computer_partition_document):