Merge branch 'upstreammaster'

[sfa.git] / sfa / rspecs / elements / element.py

diff --git a/sfa/rspecs/elements/element.py b/sfa/rspecs/elements/element.py
index bc66c76..5789a9c 100644 (file)
--- a/sfa/rspecs/elements/element.py
+++ b/sfa/rspecs/elements/element.py
@@ -4,7 +4,7 @@ class Element(dict):
 
     def __init__(self, fields={}, element=None, keys=None):
         self.element = element
-        dict.__init__(self, self.fields)
+        dict.__init__(self, dict.fromkeys(self.fields))
         if not keys:
             keys = fields.keys()
         for key in keys:
@@ -16,12 +16,12 @@ class Element(dict):
         """
         Search the specifed xml node for elements that match the 
         specified xpath query. 
-        Returns a list of objectes instanced by the specfied element_class.
+        Returns a list of objects instanced by the specified element_class.
         """
         if not element_class:
             element_class = Element
-        if not fields:
-           fields = element_class.fields.keys()
+        if not fields and hasattr(element_class, 'fields'):
+           fields = element_class.fields
         elems = xml.xpath(xpath)
         objs = []
         for elem in elems:
@@ -33,10 +33,8 @@ class Element(dict):
                     if field in elem.attrib:
                         obj[field] = elem.attrib[field]    
             objs.append(obj)
-        generic_elems = [element_class(elem.attrib, elem) for elem in elems]
         return objs
 
-
     @staticmethod
     def add_elements(xml, name, objs, fields=None):
         """
@@ -47,11 +45,13 @@ class Element(dict):
             objs = [objs]
         elems = []
         for obj in objs:
+            if not obj:
+                continue
             if not fields:
                 fields = obj.keys()
             elem = xml.add_element(name)
             for field in fields:
                 if field in obj and obj[field]:
-                    elem.set(field, obj[field])
+                    elem.set(field, unicode(obj[field]))
             elems.append(elem)
         return elems