Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-04-05 15:37:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed a bug in amp that made reloading not work.

Browse source
This commit is contained in:
Griatch 2013-09-21 22:00:46 +02:00
parent e36c7d5cc1
commit 2ba16e155e
8 changed files with 39 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/typeclasses/models.py
View file

@ -295,7 +295,7 @@ class AttributeHandler(object):
ret.append(True if _GA(self.obj, self._m2m_fieldname).filter(Q(db_key__iexact=keystr) & category_cond) else False)
return ret[0] if len(ret)==1 else ret
def get(self, key, category=None, default=None, return_obj=False, strattr=False,
def get(self, key=None, category=None, default=None, return_obj=False, strattr=False,
raise_exception=False, accessing_obj=None, default_access=True):
"""
Returns the value of the given Attribute or list of Attributes.
@ -316,8 +316,9 @@ class AttributeHandler(object):
for keystr in make_iter(key):
cachekey = "%s%s" % (category if category else "", keystr)
attr_obj = get_attr_cache(self.obj, cachekey)
key_cond = Q(db_key__iexact=keystr) if key!=None else Q()
if not attr_obj:
attr_obj = _GA(self.obj, "db_attributes").filter(Q(db_key__iexact=keystr) & category_cond)
attr_obj = _GA(self.obj, "db_attributes").filter(key_cond & category_cond)
if not attr_obj:
if raise_exception:
raise AttributeError
@ -439,10 +440,10 @@ class NickHandler(AttributeHandler):
"Add a new nick"
category = "nick_%s" % category
super(NickHandler, self).add(key, replacement, category=category, strattr=True, **kwargs)
def get(self, key, category="inputline", **kwargs):
def get(self, key=None, category="inputline", **kwargs):
"Get the replacement value matching the given key and category"
category = "nick_%s" % category
return super(NickHandler, self).get(key, category=category, strattr=True, **kwargs)
return super(NickHandler, self).get(key=key, category=category, strattr=True, **kwargs)
def remove(self, key, category="inputline", **kwargs):
"Remove Nick with matching category"
category = "nick_%s" % category