Update ensure_future/loop.create_task -> asyncio.create_task

This commit is contained in:
Tulir Asokan
2021-12-21 15:30:54 +02:00
parent 2615e11e34
commit f55d6606df
7 changed files with 14 additions and 16 deletions
+1 -1
View File
@@ -167,7 +167,7 @@ async def confirm_bridge(evt: CommandEvent) -> EventID | None:
if not ok:
return None
elif coro:
asyncio.ensure_future(coro, loop=evt.loop)
asyncio.create_task(coro)
await evt.reply("Cleaning up previous portal room...")
elif portal.mxid:
evt.sender.command_status = None
+2 -2
View File
@@ -133,7 +133,7 @@ async def enter_code_register(evt: CommandEvent) -> EventID:
await evt.sender.ensure_started(even_if_no_session=True)
first_name, last_name = evt.sender.command_status["full_name"]
user = await evt.sender.client.sign_up(evt.args[0], first_name, last_name)
asyncio.ensure_future(evt.sender.post_login(user, first_login=True), loop=evt.loop)
asyncio.create_task(evt.sender.post_login(user, first_login=True))
evt.sender.command_status = None
return await evt.reply(f"Successfully registered to Telegram.")
except PhoneNumberOccupiedError:
@@ -411,7 +411,7 @@ async def _finish_sign_in(evt: CommandEvent, user: User, login_as: u.User = None
f"[{existing_user.displayname}] (https://matrix.to/#/{existing_user.mxid})"
" was logged out from the account."
)
asyncio.ensure_future(login_as.post_login(user, first_login=True), loop=evt.loop)
asyncio.create_task(login_as.post_login(user, first_login=True))
evt.sender.command_status = None
name = f"@{user.username}" if user.username else f"+{user.phone}"
if login_as != evt.sender:
+3 -3
View File
@@ -625,7 +625,7 @@ class Portal(DBPortal, BasePortal):
self.log.exception(f"Failed to get entity through {user.tgid} for update")
return self.mxid
update = self.update_matrix_room(user, entity, self.peer_type == "user")
self.loop.create_task(update)
asyncio.create_task(update)
await self.invite_to_matrix(invites or [])
return self.mxid
async with self._room_create_lock:
@@ -813,7 +813,7 @@ class Portal(DBPortal, BasePortal):
await self.invite_to_matrix(invites)
update_room = self.loop.create_task(
update_room = asyncio.create_task(
self.update_matrix_room(
user, entity, direct, puppet, levels=power_levels, users=users
)
@@ -1959,7 +1959,7 @@ class Portal(DBPortal, BasePortal):
content.url = file.mxc
result = await self._send_message(intent, content, timestamp=evt.date)
if media.ttl_seconds:
self.loop.create_task(self._expire_telegram_photo(intent, result, media.ttl_seconds))
asyncio.create_task(self._expire_telegram_photo(intent, result, media.ttl_seconds))
if evt.message:
caption_content = await formatter.telegram_to_matrix(
evt, source, self.main_intent, no_reply_fallback=True
+3 -3
View File
@@ -210,7 +210,7 @@ class User(DBUser, AbstractUser, BaseUser):
else:
# Authenticated, run post login
self.log.debug(f"Ensuring post_login() for {self.name}")
self.loop.create_task(self.post_login())
asyncio.create_task(self.post_login())
return self
# Not authenticated, delete data if necessary
if delete_unless_authenticated:
@@ -277,7 +277,7 @@ class User(DBUser, AbstractUser, BaseUser):
async def post_login(self, info: TLUser = None, first_login: bool = False) -> None:
if self.config["metrics.enabled"] and not self._track_connection_task:
self._track_connection_task = self.loop.create_task(self._track_connection())
self._track_connection_task = asyncio.create_task(self._track_connection())
try:
await self.update_info(info)
@@ -609,7 +609,7 @@ class User(DBUser, AbstractUser, BaseUser):
puppet=puppet,
should_create=not create_limit or index < create_limit,
)
creators.append(self.loop.create_task(coro))
creators.append(asyncio.create_task(coro))
index += 1
if new_portal_cache.keys() != old_portal_cache.keys():
await self.set_portals(new_portal_cache.keys())
@@ -132,7 +132,7 @@ class UploadSender:
async def next(self, data: bytes) -> None:
if self.previous:
await self.previous
self.previous = self.loop.create_task(self._next(data))
self.previous = asyncio.create_task(self._next(data))
async def _next(self, data: bytes) -> None:
self.request.bytes = data
@@ -293,7 +293,7 @@ class ParallelTransferrer:
while part < part_count:
tasks = []
for sender in self.senders:
tasks.append(self.loop.create_task(sender.next()))
tasks.append(asyncio.create_task(sender.next()))
for task in tasks:
data = await task
if not data:
+1 -1
View File
@@ -193,7 +193,7 @@ class AuthAPI(abc.ABC):
existing_user = await User.get_by_tgid(user_info.id)
if existing_user and existing_user != user:
await existing_user.log_out()
asyncio.ensure_future(user.post_login(user_info, first_login=True), loop=self.loop)
asyncio.create_task(user.post_login(user_info, first_login=True))
if user.command_status and user.command_status["action"] == "Login":
user.command_status = None
@@ -212,9 +212,7 @@ class ProvisioningAPI(AuthAPI):
portal.photo_id = ""
await portal.save()
asyncio.ensure_future(
portal.update_matrix_room(user, entity, direct=False, levels=levels), loop=self.loop
)
asyncio.create_task(portal.update_matrix_room(user, entity, direct=False, levels=levels))
return web.Response(status=202, body="{}")
@@ -335,7 +333,7 @@ class ProvisioningAPI(AuthAPI):
self.log.exception("Failed to disconnect chat")
return self.get_error_response(500, "exception", "Failed to disconnect chat")
else:
asyncio.ensure_future(coro, loop=self.loop)
asyncio.create_task(coro)
return web.json_response({}, status=200 if sync else 202)
async def get_user_info(self, request: web.Request) -> web.Response: