Wrap asyncio.wait into a saner alternative that raises TimeoutError.

Fixes #494

1 files changed, 7 insertions, 0 deletions

diff --git a/discord/utils.py b/discord/utils.py
index 5177b1c8..2c5ddc90 100644
--- a/discord/utils.py
+++ b/discord/utils.py
@@ -276,3 +276,10 @@ def async_all(gen):
         if not elem:
             return False
     return True
+
[email protected]
+def sane_wait_for(futures, *, timeout, loop):
+    done, pending = yield from asyncio.wait(futures, timeout=timeout, loop=loop)
+
+    if len(pending) != 0:
+        raise asyncio.TimeoutError()