Merge branch 'upstreammaster'

[sfa.git] / sfa / util / xml.py

diff --git a/sfa/util/xml.py b/sfa/util/xml.py
index dece35b..bb298a3 100755 (executable)
--- a/sfa/util/xml.py
+++ b/sfa/util/xml.py
@@ -64,7 +64,7 @@ class XmlNode:
     def getparent(self):
         return XmlNode(self.node.getparent(), self.namespaces)
 
-    def remove_elements(name):
+    def remove_elements(self, name):
         """
         Removes all occurences of an element from the tree. Start at
         specified root_node if specified, otherwise start at tree's root.
@@ -77,8 +77,11 @@ class XmlNode:
             parent = element.getparent()
             parent.remove(element)
 
-    def remove(element):
-        self.node.remove(element)
+    def remove(self, element):
+        if isinstance(element, XmlNode):
+            self.node.remove(element.node)
+        else:
+            self.node.remove(element)
 
     def get(self, key, *args):
         return self.node.get(key, *args)
@@ -217,7 +220,6 @@ class XML:
             node = self.root
         node.remove_attribute(name) 
         
-
     def add_element(self, name, **kwds):
         """
         Wrapper around etree.SubElement(). Adds an element to 
@@ -268,6 +270,12 @@ class XML:
             attrs['child_nodes'] = list(elem)
         return attrs
 
+    def append(self, elem):
+        return self.root.append(elem)
+
+    def iterchildren(self):
+        return self.root.iterchildren()    
+
     def merge(self, in_xml):
         pass