Skip to content

Commit

Permalink
remove version from listener api
Browse files Browse the repository at this point in the history
  • Loading branch information
Zsailer committed Aug 23, 2022
1 parent 9278973 commit 932b7a5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 14 deletions.
4 changes: 2 additions & 2 deletions jupyter_events/logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ def add_listener(
if not callable(listener):
raise TypeError("`listener` must be a callable")

if (schema_id, version) not in self.schemas:
if schema_id not in self.schemas:
raise SchemaNotRegistered(
"The schema given for this listener has not be registered yet."
)
Expand All @@ -279,7 +279,7 @@ async def listener_signature(
self._modified_listeners[schema_id].add(listener)
return
self._unmodified_listeners[schema_id].add(listener)
for (id, version) in self.listeners:
for id in self.listeners:
if schema_id is None or id == schema_id:
if modified:
self._modified_listeners[id].add(listener)
Expand Down
17 changes: 5 additions & 12 deletions tests/test_listeners.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,13 @@ async def test_listener_function(event_logger, schema):
global listener_was_called
listener_was_called = False

async def my_listener(
logger: EventLogger, schema_id: str, version: int, data: dict
) -> None:
async def my_listener(logger: EventLogger, schema_id: str, data: dict) -> None:
global listener_was_called
listener_was_called = True # type: ignore

# Add the modifier
event_logger.add_listener(
schema_id=schema.id, version=schema.version, listener=my_listener
)
event_logger.emit(
schema_id=schema.id, version=schema.version, data={"prop": "hello, world"}
)
event_logger.add_listener(schema_id=schema.id, listener=my_listener)
event_logger.emit(schema_id=schema.id, data={"prop": "hello, world"})
await event_logger.gather_listeners()
assert listener_was_called

Expand All @@ -45,16 +39,15 @@ def test_bad_listener_function(event_logger, schema):
logger = EventLogger()

async def listener_with_extra_args(
logger: EventLogger, schema_id: str, version: int, data: dict, unknown_arg: dict
logger: EventLogger, schema_id: str, data: dict, unknown_arg: dict
) -> None:
pass

with pytest.raises(ListenerError):
event_logger.add_listener(
schema_id=schema.id,
version=schema.version,
listener=listener_with_extra_args,
)

# Ensure no modifier was added.
assert len(logger.unmodified_listeners) == 0
assert len(logger._unmodified_listeners) == 0

0 comments on commit 932b7a5

Please sign in to comment.