|
|
be75c4 |
From 2870219558eba983813aeab249e08371266ab524 Mon Sep 17 00:00:00 2001
|
|
|
be75c4 |
From: jack1142 <6032823+jack1142@users.noreply.github.com>
|
|
|
be75c4 |
Date: Tue, 31 Mar 2020 02:37:38 +0200
|
|
|
be75c4 |
Subject: [PATCH] Stop using `loop` kwarg in `asyncio.wait()` call
|
|
|
be75c4 |
(DeprecationWarning) (#327)
|
|
|
be75c4 |
|
|
|
be75c4 |
---
|
|
|
be75c4 |
uvloop/handles/process.pyx | 2 +-
|
|
|
be75c4 |
uvloop/loop.pyx | 7 +++----
|
|
|
be75c4 |
2 files changed, 4 insertions(+), 5 deletions(-)
|
|
|
be75c4 |
|
|
|
be75c4 |
diff --git a/uvloop/handles/process.pyx b/uvloop/handles/process.pyx
|
|
|
be75c4 |
index 13360d5..f2e0f58 100644
|
|
|
be75c4 |
--- a/uvloop/handles/process.pyx
|
|
|
be75c4 |
+++ b/uvloop/handles/process.pyx
|
|
|
be75c4 |
@@ -604,7 +604,7 @@ cdef class UVProcessTransport(UVProcess):
|
|
|
be75c4 |
|
|
|
be75c4 |
if handle._init_futs:
|
|
|
be75c4 |
handle._stdio_ready = 0
|
|
|
be75c4 |
- init_fut = aio_gather(*handle._init_futs, loop=loop)
|
|
|
be75c4 |
+ init_fut = aio_gather(*handle._init_futs)
|
|
|
be75c4 |
init_fut.add_done_callback(
|
|
|
be75c4 |
ft_partial(handle.__stdio_inited, waiter))
|
|
|
be75c4 |
else:
|
|
|
be75c4 |
diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx
|
|
|
be75c4 |
index c865fed..a368c52 100644
|
|
|
be75c4 |
--- a/uvloop/loop.pyx
|
|
|
be75c4 |
+++ b/uvloop/loop.pyx
|
|
|
be75c4 |
@@ -1682,7 +1682,7 @@ cdef class Loop:
|
|
|
be75c4 |
uv.SOCK_STREAM, 0, flags,
|
|
|
be75c4 |
0) for host in hosts]
|
|
|
be75c4 |
|
|
|
be75c4 |
- infos = await aio_gather(*fs, loop=self)
|
|
|
be75c4 |
+ infos = await aio_gather(*fs)
|
|
|
be75c4 |
|
|
|
be75c4 |
completed = False
|
|
|
be75c4 |
sock = None
|
|
|
be75c4 |
@@ -1908,7 +1908,7 @@ cdef class Loop:
|
|
|
be75c4 |
lai = &lai_static
|
|
|
be75c4 |
|
|
|
be75c4 |
if len(fs):
|
|
|
be75c4 |
- await aio_wait(fs, loop=self)
|
|
|
be75c4 |
+ await aio_wait(fs)
|
|
|
be75c4 |
|
|
|
be75c4 |
if rai is NULL:
|
|
|
be75c4 |
ai_remote = f1.result()
|
|
|
be75c4 |
@@ -3095,8 +3095,7 @@ cdef class Loop:
|
|
|
be75c4 |
|
|
|
be75c4 |
shutdown_coro = aio_gather(
|
|
|
be75c4 |
*[ag.aclose() for ag in closing_agens],
|
|
|
be75c4 |
- return_exceptions=True,
|
|
|
be75c4 |
- loop=self)
|
|
|
be75c4 |
+ return_exceptions=True)
|
|
|
be75c4 |
|
|
|
be75c4 |
results = await shutdown_coro
|
|
|
be75c4 |
for result, agen in zip(results, closing_agens):
|