Some optimizations towards speeding up getting the contents of a location.

src/objects/manager.py

@@ -7,7 +7,7 @@ from django.db.models.fields import exceptions
 from src.typeclasses.managers import TypedObjectManager
 from src.typeclasses.managers import returns_typeclass, returns_typeclass_list
 from src.utils import utils
-from src.utils.utils import to_unicode
+from src.utils.utils import to_unicode, make_iter
 
 ObjAttribute = None
 
@@ -194,11 +194,13 @@ class ObjectManager(TypedObjectManager):
         """
         Get all objects that has a location
         set to this one.
+
+        excludeobjs - one or more object keys to exclude from the match
         """
-        estring = ""
+        query = self.filter(db_location__id=location.id, )
-        if excludeobj:
+        for objkey in make_iter(excludeobj):
-            estring = ".exclude(db_key=excludeobj)"
+           query = query.exclude(db_key=objkey)
-        return eval("self.filter(db_location__id=location.id)%s" % estring)
+        return query
 
     @returns_typeclass_list
     def object_search(self, ostring, caller=None,

src/typeclasses/models.py

@@ -885,10 +885,9 @@ class TypedObject(SharedMemoryModel):
             # typeclass' __getattribute__, since that one would
             # try to look back to this very database object.)
             typeclass = _GA(self, 'typeclass')
-            if typeclass:
+            # will raise AttributeError also if typeclass was malformed
-                return _GA(typeclass, propname)
+            return _GA(typeclass, propname)
-            else:
+
-                raise AttributeError
     #@property
     _dbid_cache = None
     def __dbid_get(self):