Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core/events: allow handlers return some value

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2016-04-02 21:36:07 +02:00 committed by Wojtek Porczyk
parent 6052143735
commit 1cd6acd875
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/qubes-events.rst
View File

@ -26,6 +26,9 @@ fires events in reverse order. It is suitable for events fired before some
action is performed. You may at your own responsibility raise exceptions from
such events to try to prevent such action.
Event handlers may return a value. Those values are aggregated and returned
to the caller as a list of those values. The order of this list is undefined.
:py:obj:`None` values are omitted.
Handling events
---------------

16
qubes/events.py
View File

@ -129,13 +129,17 @@ class Emitter(object):
if not self.events_enabled:
return
effects = []
for cls in order:
if not hasattr(cls, '__handlers__'):
continue
for func in sorted(cls.__handlers__[event],
key=(lambda handler: hasattr(handler, 'ha_bound')),
reverse=True):
func(self, event, *args, **kwargs)
effect = func(self, event, *args, **kwargs)
if effect is not None:
effects.append(effect)
return effects
def fire_event(self, event, *args, **kwargs):
@ -150,13 +154,14 @@ class Emitter(object):
:py:meth:`fire_event_pre`
:param str event: event identificator
:returns: list of effects
All *args* and *kwargs* are passed verbatim. They are different for
different events.
'''
self._fire_event_in_order(reversed(self.__class__.__mro__), event,
*args, **kwargs)
return self._fire_event_in_order(reversed(self.__class__.__mro__),
event, *args, **kwargs)
def fire_event_pre(self, event, *args, **kwargs):
@ -170,10 +175,11 @@ class Emitter(object):
:py:meth:`fire_event`
:param str event: event identificator
:returns: list of effects
All *args* and *kwargs* are passed verbatim. They are different for
different events.
'''
self._fire_event_in_order(self.__class__.__mro__, event,
*args, **kwargs)
return self._fire_event_in_order(self.__class__.__mro__,
event, *args, **kwargs)