From 29f676c42ea69a22c948406cb2a24142f6e97bc4 Mon Sep 17 00:00:00 2001 From: Rapptz Date: Sat, 25 Feb 2017 00:03:43 -0500 Subject: Wrap asyncio.wait into a saner alternative that raises TimeoutError. Fixes #494 --- discord/state.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'discord/state.py') diff --git a/discord/state.py b/discord/state.py index 8e1ba0eb..d0e0a71f 100644 --- a/discord/state.py +++ b/discord/state.py @@ -216,7 +216,7 @@ class ConnectionState: # wait for the chunks if chunks: try: - yield from asyncio.wait(chunks, timeout=len(chunks) * 30.0, loop=self.loop) + yield from utils.sane_wait_for(chunks, timeout=len(chunks) * 30.0, loop=self.loop) except asyncio.TimeoutError: log.info('Somehow timed out waiting for chunks.') @@ -494,7 +494,7 @@ class ConnectionState: yield from self.chunker(guild) if chunks: try: - yield from asyncio.wait(chunks, timeout=len(chunks), loop=self.loop) + yield from utils.sane_wait_for(chunks, timeout=len(chunks), loop=self.loop) except asyncio.TimeoutError: log.info('Somehow timed out waiting for chunks.') @@ -773,7 +773,7 @@ class AutoShardedConnectionState(ConnectionState): # wait for the chunks if chunks: try: - yield from asyncio.wait(chunks, timeout=len(chunks) * 30.0, loop=self.loop) + yield from utils.sane_wait_for(chunks, timeout=len(chunks) * 30.0, loop=self.loop) except asyncio.TimeoutError: log.info('Somehow timed out waiting for chunks.') -- cgit v1.2.3