use shield() correctly

This commit is contained in:
udf 2018-11-14 16:34:29 +02:00
parent 3ea3808ac2
commit 28f43b5bc8
Signed by untrusted user: kate
GPG Key ID: E40724BAD73AF77B
1 changed files with 4 additions and 4 deletions

View File

@ -36,7 +36,7 @@ async def wait_for_delete(deleted_fut, timeout):
await asyncio.wait_for(deleted_fut, timeout) await asyncio.wait_for(deleted_fut, timeout)
await edit_title(DEFAULT_TITLE) await edit_title(DEFAULT_TITLE)
return True return True
except (asyncio.TimeoutError, asyncio.CancelledError): except asyncio.TimeoutError:
pass pass
return False return False
@ -54,11 +54,11 @@ async def on_name(event):
with (await lock): with (await lock):
await edit_title(new_title) await edit_title(new_title)
deleted_fut = asyncio.shield(borg.await_event(events.MessageDeleted( deleted_fut = borg.await_event(events.MessageDeleted(
chats=CHANNEL_ID, chats=CHANNEL_ID,
func=lambda e: e.deleted_id == event.message.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) await asyncio.sleep(MULTI_EDIT_TIMEOUT)
return return
if await wait_for_delete(deleted_fut, REVERT_TIMEOUT) or lock.locked(): if await wait_for_delete(deleted_fut, REVERT_TIMEOUT) or lock.locked():