Ens class refactored

Author: abukaj

lib/pymice/_Ens.py

@@ -90,15 +90,11 @@ class AmbiguousInitializationError(ValueError):
   def __init__(self, *dicts, **kwargs):
     for dict in (kwargs,) + dicts:
       for key in dict:
-        Ens.__tryToSetAttribute(Ens.__dict(self), key, dict[key])
+        Ens.__tryToSetAttribute(self.__dict__, key, dict[key])
 
   def __dict(self):
     return super(Ens, self).__getattribute__('__dict__')
 
-  @classmethod
-  def __get(cls, ens, name):
-    return cls.__dict(ens).get(name)
-
   @classmethod
   def __tryToSetAttribute(cls, attributeDict, name, value):
     if name in attributeDict:
@@ -108,7 +104,10 @@ def __tryToSetAttribute(cls, attributeDict, name, value):
       attributeDict[name] = value
 
   def __getattribute__(self, name):
-    return Ens.__get(self, name)
+    if name == '__dict__':
+      return super(Ens, self).__getattribute__(name)
+
+    return self.__dict__.get(name)
 
   def __setattr__(self, name, value):
     raise Ens.ReadOnlyError
@@ -120,10 +119,10 @@ def __dir__(self):
     return list(self)
 
   def __iter__(self):
-    return iter(Ens.__dict(self))
+    return iter(self.__dict__)
 
   def __getitem__(self, key):
-    return Ens.__get(self, key)
+    return self.__dict__.get(key)
 
   def __setitem__(self, key, value):
     raise Ens.ReadOnlyError