Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor additions to typeclass loading.

Browse source
This commit is contained in:
Griatch 2012-02-26 15:10:22 +01:00
parent c513486b5a
commit 91f2a5930c
1 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/typeclasses/typeclass.py
View file

@ -77,22 +77,12 @@ class TypeClass(object):
# unless it's really a TypedObject. # unless it's really a TypedObject.
dbobj_cls = GA(dbobj, '__class__') dbobj_cls = GA(dbobj, '__class__')
dbobj_mro = GA(dbobj_cls, '__mro__') dbobj_mro = GA(dbobj_cls, '__mro__')
if not any('src.typeclasses.models.TypedObject' if not any('src.typeclasses.models.TypedObject' in str(mro) for mro in dbobj_mro):
in str(mro) for mro in dbobj_mro): raise Exception("dbobj is not a TypedObject: %s: %s" % (dbobj_cls, dbobj_mro))
raise Exception("dbobj is not a TypedObject: %s: %s" % \
(dbobj_cls, dbobj_mro))
# store the needed things on the typeclass # store the reference to the database model instance
SA(self, 'dbobj', dbobj) SA(self, 'dbobj', dbobj)
# # sync the database object to this typeclass.
# cls = GA(self, '__class__')
# db_typeclass_path = "%s.%s" % (GA(cls, '__module__'),
# GA(cls, '__name__'))
# if not GA(dbobj, "db_typeclass_path") == db_typeclass_path:
# SA(dbobj, "db_typeclass_path", db_typeclass_path)
# GA(dbobj, "save")()
def __getattribute__(self, propname): def __getattribute__(self, propname):
""" """
Change the normal property access to Change the normal property access to
@ -123,10 +113,10 @@ class TypeClass(object):
except AttributeError: except AttributeError:
try: try:
if propname == 'ndb': if propname == 'ndb':
# get non-persistent data # get non-persistent data (getattr raises AttributeError)
return getattr(GA(dbobj, 'ndb'), propname) return getattr(GA(dbobj, 'ndb'), propname)
else: else:
return dbobj.get_attribute_raise(propname) return GA(dbobj,"get_attribute_raise")(propname)
except AttributeError: except AttributeError:
string = "Object: '%s' not found on %s(%s), nor on its typeclass %s." string = "Object: '%s' not found on %s(%s), nor on its typeclass %s."
raise AttributeError(string % (propname, dbobj, raise AttributeError(string % (propname, dbobj,