From 37e3aa340adc25a9f153217be91aa5a18d77e2e3 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Thu, 10 Nov 2011 22:43:22 -0500 Subject: [PATCH] fix merge --- sfa/rspecs/versions/sfav1.py | 2 +- sfa/util/xml.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py index e6266f81..ea38f698 100644 --- a/sfa/rspecs/versions/sfav1.py +++ b/sfa/rspecs/versions/sfav1.py @@ -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__': diff --git a/sfa/util/xml.py b/sfa/util/xml.py index d2bb6a7a..cc23e5f8 100755 --- a/sfa/util/xml.py +++ b/sfa/util/xml.py @@ -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): """ -- 2.43.0