bpo-36373: Fix deprecation warnings (GH-15889)
https://bugs.python.org/issue36373
diff --git a/Lib/asyncio/locks.py b/Lib/asyncio/locks.py
index f63d4ce..d94daeb 100644
--- a/Lib/asyncio/locks.py
+++ b/Lib/asyncio/locks.py
@@ -332,7 +332,7 @@
DeprecationWarning, stacklevel=2)
if lock is None:
- lock = Lock(loop=self._loop)
+ lock = Lock(loop=loop)
elif lock._loop is not self._loop:
raise ValueError("loop argument must agree with lock")
diff --git a/Lib/asyncio/queues.py b/Lib/asyncio/queues.py
index c96b4a0..390ae9a 100644
--- a/Lib/asyncio/queues.py
+++ b/Lib/asyncio/queues.py
@@ -45,7 +45,7 @@
# Futures.
self._putters = collections.deque()
self._unfinished_tasks = 0
- self._finished = locks.Event(loop=self._loop)
+ self._finished = locks.Event(loop=loop)
self._finished.set()
self._init(maxsize)
diff --git a/Lib/test/test_asyncio/test_locks.py b/Lib/test/test_asyncio/test_locks.py
index d69b56d..a9953b4 100644
--- a/Lib/test/test_asyncio/test_locks.py
+++ b/Lib/test/test_asyncio/test_locks.py
@@ -500,10 +500,9 @@
self.assertIs(cond._loop, self.loop)
def test_ctor_noloop(self):
- with self.assertWarns(DeprecationWarning):
- asyncio.set_event_loop(self.loop)
- cond = asyncio.Condition()
- self.assertIs(cond._loop, self.loop)
+ asyncio.set_event_loop(self.loop)
+ cond = asyncio.Condition()
+ self.assertIs(cond._loop, self.loop)
def test_wait(self):
with self.assertWarns(DeprecationWarning):
diff --git a/Lib/test/test_asyncio/test_queues.py b/Lib/test/test_asyncio/test_queues.py
index 02e8e43..171176c 100644
--- a/Lib/test/test_asyncio/test_queues.py
+++ b/Lib/test/test_asyncio/test_queues.py
@@ -83,8 +83,7 @@
def test_ctor_noloop(self):
asyncio.set_event_loop(self.loop)
- with self.assertWarns(DeprecationWarning):
- q = asyncio.Queue()
+ q = asyncio.Queue()
self.assertIs(q._loop, self.loop)
def test_repr(self):
diff --git a/Lib/unittest/async_case.py b/Lib/unittest/async_case.py
index a3c8bfb..1bc1312 100644
--- a/Lib/unittest/async_case.py
+++ b/Lib/unittest/async_case.py
@@ -89,8 +89,9 @@
else:
return ret
- async def _asyncioLoopRunner(self):
- queue = self._asyncioCallsQueue
+ async def _asyncioLoopRunner(self, fut):
+ self._asyncioCallsQueue = queue = asyncio.Queue()
+ fut.set_result(None)
while True:
query = await queue.get()
queue.task_done()
@@ -113,8 +114,9 @@
asyncio.set_event_loop(loop)
loop.set_debug(True)
self._asyncioTestLoop = loop
- self._asyncioCallsQueue = asyncio.Queue(loop=loop)
- self._asyncioCallsTask = loop.create_task(self._asyncioLoopRunner())
+ fut = loop.create_future()
+ self._asyncioCallsTask = loop.create_task(self._asyncioLoopRunner(fut))
+ loop.run_until_complete(fut)
def _tearDownAsyncioLoop(self):
assert self._asyncioTestLoop is not None