Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions esper/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,11 @@ def remove_handler(name: str, func: _Callable[..., None]) -> None:
receive the named event, or if the named event does
not exist, this function call will pass silently.
"""
if func not in event_registry.get(name, []):
func_ref = _ref(func)
if func_ref not in event_registry.get(name, []):
return

event_registry[name].remove(func)
event_registry[name].remove(func_ref)
if not event_registry[name]:
del event_registry[name]

Expand Down
10 changes: 10 additions & 0 deletions tests/test_world.py
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,16 @@ def handler():
esper.dispatch_event("foo")
assert called == 2

def test_remove_handler():
def handler():
pass

assert esper.event_registry == {}
esper.set_handler("foo", handler)
assert "foo" in esper.event_registry
esper.remove_handler("foo", handler)
assert esper.event_registry == {}


##################################################
# Some helper functions and Component templates:
Expand Down
Loading