From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Thu, 10 Nov 2011 02:29:03 +0000 (-0500)
Subject: xpath() returns sfa.util.xml.XmlNode instances. Added iterchildren() method
X-Git-Tag: sfa-1.1-3~78
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=139e88ac0b6b66dc7de5c4c0c40762b496d8bf07

xpath() returns sfa.util.xml.XmlNode instances. Added iterchildren() method
---

diff --git a/sfa/util/xml.py b/sfa/util/xml.py
index b2aea13b..047c9972 100755
--- a/sfa/util/xml.py
+++ b/sfa/util/xml.py
@@ -46,7 +46,8 @@ class XmlNode:
     def xpath(self, xpath, namespaces=None):
         if not namespaces:
             namespaces = self.namespaces 
-        return self.node.xpath(xpath, namespaces=namespaces)
+        elems = self.node.xpath(xpath, namespaces=namespaces)
+        return [XmlNode(elem, namespaces) for elem in elems]
     
     def add_element(name, *args, **kwds):
         element = etree.SubElement(name, args, kwds)
@@ -73,7 +74,10 @@ class XmlNode:
     
     def unset(self, key):
         del self.node.attrib[key]
-   
+  
+    def iterchildren(self):
+        return self.node.iterchildren()
+     
     def toxml(self):
         return etree.tostring(self.node, encoding='UTF-8', pretty_print=True)