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

Removed redundant NDBHolder class, consolidated with DBHolder.

Browse source
This commit is contained in:
Jonathan Piacenti 2015-03-14 14:12:19 -05:00 • committed by Griatch
parent 47170a6ffa
commit 461545fe58
1 changed files with 3 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

29
evennia/typeclasses/models.py
View file

@ -128,8 +128,8 @@ class TypeclassBase(SharedMemoryModelBase):
class DbHolder(object): class DbHolder(object):
"Holder for allowing property access of attributes" "Holder for allowing property access of attributes"
def __init__(self, obj, name): def __init__(self, obj, name, manager_name='attributes'):
_SA(self, name, obj.attributes) _SA(self, name, _GA(obj, manager_name))
_SA(self, 'name', name) _SA(self, 'name', name)
def __getattribute__(self, attrname): def __getattribute__(self, attrname):
@ -598,30 +598,7 @@ class TypedObject(SharedMemoryModel):
try: try:
return self._ndb_holder return self._ndb_holder
except AttributeError: except AttributeError:
class NDbHolder(object): self._ndb_holder = DbHolder(self, "nattrhandler", manager_name='nattributes')
"Holder for allowing property access of attributes"
def __init__(self, obj):
_SA(self, "nattrhandler", obj.nattributes)
def __getattribute__(self, attrname):
if attrname == 'all':
# we allow to overload our default .all
attr = _GA(self, "nattrhandler").get('all')
if attr:
return attr
return self.all
return _GA(self, "nattrhandler").get(attrname)
def __setattr__(self, attrname, value):
_GA(self, "nattrhandler").add(attrname, value)
def __delattr__(self, attrname):
_GA(self, "nattrhandler").remove(attrname)
def get_all(self):
return _GA(self, "nattrhandler").all()
all = property(get_all)
self._ndb_holder = NDbHolder(self)
return self._ndb_holder return self._ndb_holder
#@db.setter #@db.setter