From 28f43b5bc819fed71585f44ce96c11ee8d2b0489 Mon Sep 17 00:00:00 2001 From: udf Date: Wed, 14 Nov 2018 16:34:29 +0200 Subject: [PATCH] use shield() correctly --- stdplugins/sp_prog_rename.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stdplugins/sp_prog_rename.py b/stdplugins/sp_prog_rename.py index 3ff5bfd..0031b32 100644 --- a/stdplugins/sp_prog_rename.py +++ b/stdplugins/sp_prog_rename.py @@ -36,7 +36,7 @@ async def wait_for_delete(deleted_fut, timeout): await asyncio.wait_for(deleted_fut, timeout) await edit_title(DEFAULT_TITLE) return True - except (asyncio.TimeoutError, asyncio.CancelledError): + except asyncio.TimeoutError: pass return False @@ -54,11 +54,11 @@ async def on_name(event): with (await lock): await edit_title(new_title) - deleted_fut = asyncio.shield(borg.await_event(events.MessageDeleted( + deleted_fut = borg.await_event(events.MessageDeleted( chats=CHANNEL_ID, func=lambda e: e.deleted_id == event.message.id - ))) - if await wait_for_delete(deleted_fut, MULTI_EDIT_TIMEOUT): + )) + if await wait_for_delete(asyncio.shield(deleted_fut), MULTI_EDIT_TIMEOUT): await asyncio.sleep(MULTI_EDIT_TIMEOUT) return if await wait_for_delete(deleted_fut, REVERT_TIMEOUT) or lock.locked():