Skip to content

Commit 70f457f

Browse files
LoopThrough-i-jtimabbott
authored andcommitted
zulip: Add support for additional args for Client.call_on_each_*.
- Added `**kwargs` typed `object` in the definition of `Client.call_on_each_*` . - Replaced `**kwargs` type from `Any` to `object` in the definition of `Client.register`. Fixes part of #647
1 parent 262c926 commit 70f457f

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

zulip/zulip/__init__.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -617,17 +617,17 @@ def call_on_each_event(
617617
callback: Callable[[Dict[str, Any]], None],
618618
event_types: Optional[List[str]] = None,
619619
narrow: Optional[List[List[str]]] = None,
620+
**kwargs: object,
620621
) -> None:
621622
if narrow is None:
622623
narrow = []
623624

624625
def do_register() -> Tuple[str, int]:
625-
while True:
626-
if event_types is None:
627-
res = self.register()
628-
else:
629-
res = self.register(event_types=event_types, narrow=narrow)
626+
if event_types is None:
627+
narrow = None
630628

629+
while True:
630+
res = self.register(event_types, narrow, **kwargs)
631631
if 'error' in res['result']:
632632
if self.verbose:
633633
print("Server returned error:\n%s" % (res['msg'],))
@@ -679,11 +679,11 @@ def do_register() -> Tuple[str, int]:
679679
last_event_id = max(last_event_id, int(event['id']))
680680
callback(event)
681681

682-
def call_on_each_message(self, callback: Callable[[Dict[str, Any]], None]) -> None:
682+
def call_on_each_message(self, callback: Callable[[Dict[str, Any]], None], **kwargs: object) -> None:
683683
def event_callback(event: Dict[str, Any]) -> None:
684684
if event['type'] == 'message':
685685
callback(event['message'])
686-
self.call_on_each_event(event_callback, ['message'])
686+
self.call_on_each_event(event_callback, ['message'], None, **kwargs)
687687

688688
def get_messages(self, message_filters: Dict[str, Any]) -> Dict[str, Any]:
689689
'''
@@ -1029,7 +1029,7 @@ def register(
10291029
self,
10301030
event_types: Optional[Iterable[str]] = None,
10311031
narrow: Optional[List[List[str]]] = None,
1032-
**kwargs: Any
1032+
**kwargs: object
10331033
) -> Dict[str, Any]:
10341034
'''
10351035
Example usage:

0 commit comments

Comments
 (0)