Some optimizations, cleanup and a few bugfixes. Just changing a spurious property retrieval in the typeclass removed an extra, pointless database query.

src/typeclasses/models.py

@@ -56,6 +56,7 @@ _DA = object.__delattr__
 _PLOADS = pickle.loads
 _PDUMPS = pickle.dumps
 
+
 # Property Cache mechanism.
 
 def _get_cache(obj, name):
@@ -889,6 +890,17 @@ class TypedObject(SharedMemoryModel):
             # try to look back to this very database object.)
             return _GA(_GA(self, 'typeclass'), propname)
 
+    def _hasattr(self, obj, attrname):
+        """
+        Loop-safe version of hasattr, to avoid running a lookup that
+        will be rerouted up the typeclass. Returns True/False.
+        """
+        try:
+            _GA(obj, attrname)
+            return True
+        except AttributeError:
+            return False
+
     #@property
     _dbid_cache = None
     def __dbid_get(self):
@@ -1504,7 +1516,7 @@ class TypedObject(SharedMemoryModel):
     def nattr(self, attribute_name=None, value=None, delete=False):
         """
         This is the equivalence of self.attr but for non-persistent
-        stores.
+        stores. Will not raise error but return None.
         """
         if attribute_name == None:
             # act as a list method
@@ -1515,11 +1527,11 @@ class TypedObject(SharedMemoryModel):
                         if not val.startswith['_']]
         elif delete == True:
             if hasattr(self.ndb, attribute_name):
-                _DA(self.db, attribute_name)
+                _DA(_GA(self, "db"), attribute_name)
         elif value == None:
             # act as a getter.
             if hasattr(self.ndb, attribute_name):
-                _GA(self.ndb, attribute_name)
+                _GA(_GA(self, "ndb"), attribute_name)
             else:
                 return None
         else:

src/typeclasses/typeclass.py

@@ -11,7 +11,6 @@ used by the typesystem or django itself.
 """
 
 from src.utils.logger import log_trace, log_errmsg
-from django.conf import settings
 
 __all__ = ("TypeClass",)
 
@@ -115,10 +114,11 @@ class TypeClass(object):
                 return _GA(dbobj, propname)
             except AttributeError:
                 try:
+                    #XXX deprecated
                     return _GA(dbobj,"get_attribute_raise")(propname)
                 except AttributeError:
                     string = "Object: '%s' not found on %s(#%s), nor on its typeclass %s."
-                    raise AttributeError(string % (propname, dbobj, dbobj.dbid, dbobj.typeclass_path))
+                    raise AttributeError(string % (propname, dbobj, _GA(dbobj, "dbid"), _GA(dbobj, "typeclass_path")))
 
     def __setattr__(self, propname, value):
         """
@@ -134,7 +134,6 @@ class TypeClass(object):
             string += " (protected: [%s])" % (", ".join(PROTECTED))
             log_errmsg(string % (self.name, propname))
             return
-
         try:
             dbobj = _GA(self, 'dbobj')
         except AttributeError:
@@ -148,19 +147,20 @@ class TypeClass(object):
                 _GA(dbobj, propname)
                 _SA(dbobj, propname, value)
             except AttributeError:
+                #XXX deprecated
                 dbobj.set_attribute(propname, value)
         else:
             _SA(self, propname, value)
 
-        def __eq__(self, other):
-            """
-            dbobj-recognized comparison
-            """
-            try:
-                return other == self or other == _GA(self, dbobj) or other == _GA(self, dbobj).user
-            except AttributeError:
-                # if self.dbobj.user fails it means the two previous comparisons failed already
-                return False
+    def __eq__(self, other):
+        """
+        dbobj-recognized comparison
+        """
+        try:
+            return other == self or other == _GA(self, dbobj) or other == _GA(self, dbobj).user
+        except AttributeError:
+            # if self.dbobj.user fails it means the two previous comparisons failed already
+            return False
 
 
     def __delattr__(self, propname):