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

Make AttributeHandler.remove delete by category only as well

Browse source
This commit is contained in:
Griatch 2019-04-18 22:24:51 +02:00
parent dfef343a27
commit 983a58f055
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
evennia/typeclasses/attributes.py
View file

@ -601,14 +601,15 @@ class AttributeHandler(object):
# Add new objects to m2m field all at once # Add new objects to m2m field all at once
getattr(self.obj, self._m2m_fieldname).add(*new_attrobjs) getattr(self.obj, self._m2m_fieldname).add(*new_attrobjs)
def remove(self, key, raise_exception=False, category=None, def remove(self, key=None, raise_exception=False, category=None,
accessing_obj=None, default_access=True): accessing_obj=None, default_access=True):
""" """
Remove attribute or a list of attributes from object. Remove attribute or a list of attributes from object.
Args: Args:
key (str or list): An Attribute key to remove or a list of keys. If key (str or list, optional): An Attribute key to remove or a list of keys. If
multiple keys, they must all be of the same `category`. multiple keys, they must all be of the same `category`. If None and
category is not given, remove all Attributes.
raise_exception (bool, optional): If set, not finding the raise_exception (bool, optional): If set, not finding the
Attribute to delete will raise an exception instead of Attribute to delete will raise an exception instead of
just quietly failing. just quietly failing.
@ -625,7 +626,16 @@ class AttributeHandler(object):
AttributeError: If `raise_exception` is set and no matching Attribute AttributeError: If `raise_exception` is set and no matching Attribute
was found matching `key`. was found matching `key`.
Notes:
If neither key nor category is given, this acts as clear().
""" """
if key is None:
self.clear(category=category, accessing_obj=accessing_obj,
default_access=default_access)
return
category = category.strip().lower() if category is not None else None category = category.strip().lower() if category is not None else None
for keystr in make_iter(key): for keystr in make_iter(key):

8
evennia/typeclasses/tags.py
View file

@ -309,13 +309,11 @@ class TagHandler(object):
category (str, optional): The Tag category to limit the category (str, optional): The Tag category to limit the
request to. Note that `None` is the valid, default request to. Note that `None` is the valid, default
category category
Raises: Notes:
RuntimeError: If neither key nor category is specifed. If neither key nor category is specified, this acts
as .clear().
""" """
if key is None and category is None:
raise RuntimeError("TagHandler.remove requires either key or category. "
"Use TagHandler.clear to remove all tags.")
if not key: if not key:
# only category # only category
self.clear(category=category) self.clear(category=category)