fix merge
authorTony Mack <tmack@paris.CS.Princeton.EDU>
Fri, 11 Nov 2011 03:43:22 +0000 (22:43 -0500)
committerTony Mack <tmack@paris.CS.Princeton.EDU>
Fri, 11 Nov 2011 03:43:22 +0000 (22:43 -0500)
sfa/rspecs/versions/sfav1.py
sfa/util/xml.py

index e6266f8..ea38f69 100644 (file)
@@ -191,7 +191,7 @@ class SFAv1(BaseVersion):
         for network in networks:
             current_network = network.get('name')
             if current_network and current_network not in current_networks:
-                self.xml.root.append(network)
+                self.xml.root.append(network.element)
                 current_networks.append(current_network)
 
 if __name__ == '__main__':
index d2bb6a7..cc23e5f 100755 (executable)
@@ -56,7 +56,10 @@ class XmlNode:
         return XmlNode(element, self.namespaces)
 
     def append(self, elem):
-        self.node.append(elem)
+        if isinstance(elem, XmlNode):
+            self.node.append(elem.node)
+        else:
+            self.node.append(elem)
 
     def remove_elements(name):
         """