Browse Source

Fix more deprecation warnings

pull/2430/head
Rapptz 5 years ago
parent
commit
4ef0fb0d95
  1. 2
      discord/gateway.py
  2. 2
      discord/shard.py
  3. 5
      discord/utils.py

2
discord/gateway.py

@ -389,7 +389,7 @@ class DiscordWebSocket(websockets.client.WebSocketClientProtocol):
if op == self.INVALIDATE_SESSION:
if data is True:
await asyncio.sleep(5.0, loop=self.loop)
await asyncio.sleep(5.0)
await self.close()
raise ResumeWebSocket(self.shard_id)

2
discord/shard.py

@ -289,7 +289,7 @@ class AutoShardedClient(Client):
except Exception:
pass
to_close = [shard.ws.close() for shard in self.shards.values()]
to_close = [asyncio.ensure_future(shard.ws.close(), loop=self.loop) for shard in self.shards.values()]
if to_close:
await asyncio.wait(to_close)

5
discord/utils.py

@ -328,7 +328,10 @@ async def async_all(gen, *, check=_isawaitable):
return True
async def sane_wait_for(futures, *, timeout):
done, pending = await asyncio.wait(futures, timeout=timeout, return_when=asyncio.ALL_COMPLETED)
ensured = [
asyncio.ensure_future(fut) for fut in futures
]
done, pending = await asyncio.wait(ensured, timeout=timeout, return_when=asyncio.ALL_COMPLETED)
if len(pending) != 0:
raise asyncio.TimeoutError()

Loading…
Cancel
Save