fix remove listener (#3196)
This commit is contained in:
1 parent
35b388edce
commit
5995f2438e
6 files changed
+54
-44
No files matched your search
+15
-9
@@ -299,7 +299,7 @@ class EventBus(object):
|
||||
|
||||
def remove_listener():
|
||||
"""Remove the listener."""
|
||||
self.remove_listener(event_type, listener)
|
||||
self._remove_listener(event_type, listener)
|
||||
|
||||
return remove_listener
|
||||
|
||||
@@ -309,7 +309,7 @@ class EventBus(object):
|
||||
To listen to all events specify the constant ``MATCH_ALL``
|
||||
as event_type.
|
||||
|
||||
Returns registered listener that can be used with remove_listener.
|
||||
Returns function to unsubscribe the listener.
|
||||
"""
|
||||
@ft.wraps(listener)
|
||||
def onetime_listener(event):
|
||||
@@ -323,15 +323,21 @@ class EventBus(object):
|
||||
# This will make sure the second time it does nothing.
|
||||
setattr(onetime_listener, 'run', True)
|
||||
|
||||
self.remove_listener(event_type, onetime_listener)
|
||||
remove_listener()
|
||||
|
||||
listener(event)
|
||||
|
||||
self.listen(event_type, onetime_listener)
|
||||
remove_listener = self.listen(event_type, onetime_listener)
|
||||
|
||||
return onetime_listener
|
||||
return remove_listener
|
||||
|
||||
def remove_listener(self, event_type, listener):
|
||||
"""Remove a listener of a specific event_type. (DEPRECATED 0.28)."""
|
||||
_LOGGER.warning('bus.remove_listener has been deprecated. Please use '
|
||||
'the function returned from calling listen.')
|
||||
self._remove_listener(event_type, listener)
|
||||
|
||||
def _remove_listener(self, event_type, listener):
|
||||
"""Remove a listener of a specific event_type."""
|
||||
with self._lock:
|
||||
try:
|
||||
@@ -344,7 +350,8 @@ class EventBus(object):
|
||||
except (KeyError, ValueError):
|
||||
# KeyError is key event_type listener did not exist
|
||||
# ValueError if listener did not exist within event_type
|
||||
pass
|
||||
_LOGGER.warning('Unable to remove unknown listener %s',
|
||||
listener)
|
||||
|
||||
|
||||
class State(object):
|
||||
@@ -688,14 +695,13 @@ class ServiceRegistry(object):
|
||||
if call.data[ATTR_SERVICE_CALL_ID] == call_id:
|
||||
executed_event.set()
|
||||
|
||||
self._bus.listen(EVENT_SERVICE_EXECUTED, service_executed)
|
||||
unsub = self._bus.listen(EVENT_SERVICE_EXECUTED, service_executed)
|
||||
|
||||
self._bus.fire(EVENT_CALL_SERVICE, event_data)
|
||||
|
||||
if blocking:
|
||||
success = executed_event.wait(SERVICE_CALL_LIMIT)
|
||||
self._bus.remove_listener(
|
||||
EVENT_SERVICE_EXECUTED, service_executed)
|
||||
unsub()
|
||||
return success
|
||||
|
||||
def _event_to_service_call(self, event):
|
||||
|
||||
Reference in new issue
Block a user