python3 - 2to3 + miscell obvious tweaks

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

diff --git a/sfa/rspecs/elements/element.py b/sfa/rspecs/elements/element.py
index 2b27d9e..7dcfa00 100644 (file)
--- a/sfa/rspecs/elements/element.py
+++ b/sfa/rspecs/elements/element.py
@@ -2,22 +2,22 @@ class Element(dict):
 
     fields = {}
 
-    def __init__(self, fields={}, element=None):
+    def __init__(self, fields=None, element=None, keys=None):
+        if fields is None:
+            fields = {}
         self.element = element
-        dict.__init__(self, self.fields) 
-        self.update(fields)
+        dict.__init__(self, dict.fromkeys(self.fields))
+        if not keys:
+            keys = list(fields.keys())
+        for key in keys:
+            if key in fields:
+                self[key] = fields[key]
 
-    @staticmethod
-    def get(element_class, xml, xpath, namespaces=None):
-        elems = xml.xpath(xpath, namespaces)
-        generic_elems = [element_class(elem.attrib, elem) for elem in elems]
-        return generic_elems
-
-
-    @staticmethod
-    def add(xml, element_class, name, obj):
-        elem = xml.add_element(name)
-        for field in element_class.fields:
-            if field in obj and obj[field]:
-                elem.set(field, obj[field])
-        return elem
+    def __getattr__(self, name):
+        if hasattr(self.__dict__, name):
+            return getattr(self.__dict__, name)
+        elif hasattr(self.element, name):
+            return getattr(self.element, name)
+        else:
+            raise AttributeError("class Element of type {} has no attribute {}"
+                                 .format(self.__class__.__name__, name))