updated Xml.todict()

diff --git a/sfa/util/record.py b/sfa/util/record.py
index 424f419..7ebf379 100644 (file)
--- a/sfa/util/record.py
+++ b/sfa/util/record.py
@@ -319,7 +319,7 @@ class SfaRecord(Row):
         #dict = xmlrpclib.loads(str)[0][0]
 
         record = XML(str)
         #dict = xmlrpclib.loads(str)[0][0]
 
         record = XML(str)

-        self.load_from_dict(record.todict2())
+        self.load_from_dict(record.todict())

 
     ##
     # Dump the record to stdout
 
     ##
     # Dump the record to stdout

diff --git a/sfa/util/xml.py b/sfa/util/xml.py
index d880ed3..0ef71d9 100755 (executable)
--- a/sfa/util/xml.py
+++ b/sfa/util/xml.py
@@ -216,20 +216,8 @@ class XML:
     def toxml(self):
         return etree.tostring(self.root, encoding='UTF-8', pretty_print=True)  
     
     def toxml(self):
         return etree.tostring(self.root, encoding='UTF-8', pretty_print=True)  
     

-    def todict(self, elem=None):
-        if elem is None:
-            elem = self.root
-        d = {}
-        d.update(elem.attrib)
-        d['text'] = elem.text
-        for child in elem.iterchildren():
-            if child.tag not in d:
-                d[child.tag] = []
-            d[child.tag].append(self.todict(child))
-        return d
-

     # XXX smbaker, for record.load_from_string
     # XXX smbaker, for record.load_from_string

-    def todict2(self, elem=None):
+    def todict(self, elem=None):

         if elem is None:
             elem = self.root
         d = {}
         if elem is None:
             elem = self.root
         d = {}