aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRapptz <[email protected]>2019-11-20 03:04:04 -0500
committerRapptz <[email protected]>2019-11-20 03:04:04 -0500
commit4ef0fb0d959b69d3b2cea87b0fc08310028e348f (patch)
tree551edac62a819e4a1afe9cb19202df43cd9505b3
parentFix one more remaining loop passing for 3.8 in a Lock (diff)
downloaddiscord.py-4ef0fb0d959b69d3b2cea87b0fc08310028e348f.tar.xz
discord.py-4ef0fb0d959b69d3b2cea87b0fc08310028e348f.zip
Fix more deprecation warnings
-rw-r--r--discord/gateway.py2
-rw-r--r--discord/shard.py2
-rw-r--r--discord/utils.py5
3 files changed, 6 insertions, 3 deletions
diff --git a/discord/gateway.py b/discord/gateway.py
index 81c7c09f..f2dc7fcb 100644
--- a/discord/gateway.py
+++ b/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)
diff --git a/discord/shard.py b/discord/shard.py
index 09891bd8..3e85d445 100644
--- a/discord/shard.py
+++ b/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)
diff --git a/discord/utils.py b/discord/utils.py
index 2b4f0fda..bc281502 100644
--- a/discord/utils.py
+++ b/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()