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

Fixed a kwarg call where Tickerhandler assumed too much about the hook method.

Browse source
This commit is contained in:
Griatch 2015-05-14 21:36:43 +02:00
parent b7872f2d6f
commit 554b55c9ec
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
evennia/scripts/tickerhandler.py
View file

@ -92,7 +92,7 @@ class Ticker(object):
appropriately. appropriately.
""" """
for store_key, (obj, args, kwargs) in self.subscriptions.items(): for store_key, (obj, args, kwargs) in self.subscriptions.items():
hook_key = yield kwargs.get("_hook_key", "at_tick") hook_key = yield kwargs.pop("_hook_key", "at_tick")
if not obj or not obj.pk: if not obj or not obj.pk:
# object was deleted between calls # object was deleted between calls
self.remove(store_key) self.remove(store_key)
@ -104,6 +104,9 @@ class Ticker(object):
self.remove(store_key) self.remove(store_key)
except Exception: except Exception:
log_trace() log_trace()
finally:
# make sure to re-store
kwargs["_hook_key"] = hook_key
def __init__(self, interval): def __init__(self, interval):
""" """