From 751987e2b0c9b2eb3757fcf2a889482a1cb04b3a Mon Sep 17 00:00:00 2001 From: mathieui Date: Sat, 20 Feb 2021 12:39:51 +0100 Subject: xmlstream: remove loop parameter to wait_for Deprecated in 3.8, removed in 3.10 --- slixmpp/xmlstream/xmlstream.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/slixmpp/xmlstream/xmlstream.py b/slixmpp/xmlstream/xmlstream.py index de3ea8cf..8a726e15 100644 --- a/slixmpp/xmlstream/xmlstream.py +++ b/slixmpp/xmlstream/xmlstream.py @@ -533,7 +533,6 @@ class XMLStream(asyncio.BaseProtocol): await asyncio.wait_for( self.waiting_queue.join(), wait, - loop=self.loop ) except asyncio.TimeoutError: wait = 0 # we already consumed the timeout @@ -1182,20 +1181,25 @@ class XMLStream(asyncio.BaseProtocol): :param str event: Event to wait on. :param int timeout: Timeout + :raises: :class:`asyncio.TimeoutError` when the timeout is reached """ fut = asyncio.Future() + def result_handler(event_data): if not fut.done(): fut.set_result(event_data) else: - log.debug("Future registered on event '%s' was alredy done", event) + log.debug( + "Future registered on event '%s' was alredy done", + event + ) self.add_event_handler( event, result_handler, disposable=True, ) - return await asyncio.wait_for(fut, timeout, loop=self.loop) + return await asyncio.wait_for(fut, timeout) @contextmanager def event_handler(self, event: str, handler: Callable): -- cgit v1.2.3