hoelee/Telethon
1
0
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-06-18 11:06:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Properly handle cancellation in _ReadyQueue

Browse Source
This commit is contained in:
Lonami Exo 2018-09-29 13:36:05 +02:00
parent 105bd52eee
commit 2d275989cb
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
telethon/helpers.py
View File

@ -111,12 +111,16 @@ class _ReadyQueue:
Returns a list of all the items added to the queue until now and Returns a list of all the items added to the queue until now and
clears the list from the queue itself. Returns ``None`` if cancelled. clears the list from the queue itself. Returns ``None`` if cancelled.
""" """
ready = asyncio.ensure_future(self._ready.wait(), loop=self._loop) ready = self._loop.create_task(self._ready.wait())
try:
done, pending = await asyncio.wait( done, pending = await asyncio.wait(
[ready, cancellation], [ready, cancellation],
return_when=asyncio.FIRST_COMPLETED, return_when=asyncio.FIRST_COMPLETED,
loop=self._loop loop=self._loop
) )
except asyncio.CancelledError:
done = [cancellation]
if cancellation in done: if cancellation in done:
ready.cancel() ready.cancel()
return None return None

4
telethon/network/connection/connection.py
View File

@ -51,8 +51,8 @@ class Connection(abc.ABC):
@property @property
def disconnected(self): def disconnected(self):
if not self._disconnected_future: if not self._disconnected_future:
self._disconnected_future = asyncio.ensure_future( self._disconnected_future = \
self._disconnected.wait(), loop=self._loop) self._loop.create_task(self._disconnected.wait())
return self._disconnected_future return self._disconnected_future
def clone(self): def clone(self):