Merge branch 'master' into senslab2

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

diff --git a/sfa/rspecs/elements/element.py b/sfa/rspecs/elements/element.py
index e185490..7f79e81 100644 (file)
--- a/sfa/rspecs/elements/element.py
+++ b/sfa/rspecs/elements/element.py
@@ -13,9 +13,9 @@ class Element(dict):
 
 
     def __getattr__(self, name):
-        if hasattr(self, name):
-            return 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 has not attribute %s" % name
+            raise AttributeError, "class Element has no attribute %s" % name