LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2024-11-29 04:43:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Better behaviour for conversation.cancel() (#1183)

Browse Source
This commit is contained in:
Lonami Exo 2019-06-03 19:28:22 +02:00
parent 9d6150da37
commit 690a40be77
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
telethon/tl/custom/conversation.py
View File

@ -418,8 +418,13 @@ class Conversation(ChatGetter):
return self return self
def cancel(self): def cancel(self):
"""Cancels the current conversation and exits the context manager.""" """
raise _ConversationCancelled() Cancels the current conversation. Pending responses and subsequent
calls to get a response will raise ``asyncio.CancelledError``.
This method is synchronous and should not be awaited.
"""
self._cancel_all()
async def __aexit__(self, exc_type, exc_val, exc_tb): async def __aexit__(self, exc_type, exc_val, exc_tb):
chat_id = utils.get_peer_id(self._chat_peer) chat_id = utils.get_peer_id(self._chat_peer)
@ -430,11 +435,6 @@ class Conversation(ChatGetter):
del self._client._conversations[self._id] del self._client._conversations[self._id]
self._cancel_all() self._cancel_all()
return isinstance(exc_val, _ConversationCancelled)
__enter__ = helpers._sync_enter __enter__ = helpers._sync_enter
__exit__ = helpers._sync_exit __exit__ = helpers._sync_exit
class _ConversationCancelled(InterruptedError):
pass