asyncio: PendingDeprecationWarning -> DeprecationWarning (GH-12494)
`Task.current_task()` and `Task.all_tasks()` will be removed in 3.9.
diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py
index 15422da..d850837 100644
--- a/Lib/asyncio/tasks.py
+++ b/Lib/asyncio/tasks.py
@@ -97,7 +97,7 @@
"""
warnings.warn("Task.current_task() is deprecated, "
"use asyncio.current_task() instead",
- PendingDeprecationWarning,
+ DeprecationWarning,
stacklevel=2)
if loop is None:
loop = events.get_event_loop()
@@ -111,7 +111,7 @@
"""
warnings.warn("Task.all_tasks() is deprecated, "
"use asyncio.all_tasks() instead",
- PendingDeprecationWarning,
+ DeprecationWarning,
stacklevel=2)
return _all_tasks_compat(loop)
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index 22f14f8..1cdff52 100644
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -1634,26 +1634,26 @@
def test_current_task_deprecated(self):
Task = self.__class__.Task
- with self.assertWarns(PendingDeprecationWarning):
+ with self.assertWarns(DeprecationWarning):
self.assertIsNone(Task.current_task(loop=self.loop))
async def coro(loop):
- with self.assertWarns(PendingDeprecationWarning):
+ with self.assertWarns(DeprecationWarning):
self.assertIs(Task.current_task(loop=loop), task)
# See http://bugs.python.org/issue29271 for details:
asyncio.set_event_loop(loop)
try:
- with self.assertWarns(PendingDeprecationWarning):
+ with self.assertWarns(DeprecationWarning):
self.assertIs(Task.current_task(None), task)
- with self.assertWarns(PendingDeprecationWarning):
+ with self.assertWarns(DeprecationWarning):
self.assertIs(Task.current_task(), task)
finally:
asyncio.set_event_loop(None)
task = self.new_task(self.loop, coro(self.loop))
self.loop.run_until_complete(task)
- with self.assertWarns(PendingDeprecationWarning):
+ with self.assertWarns(DeprecationWarning):
self.assertIsNone(Task.current_task(loop=self.loop))
def test_current_task(self):
@@ -1982,7 +1982,7 @@
Task = self.__class__.Task
async def coro():
- with self.assertWarns(PendingDeprecationWarning):
+ with self.assertWarns(DeprecationWarning):
assert Task.all_tasks(self.loop) == {t}
t = self.new_task(self.loop, coro())
@@ -2012,9 +2012,9 @@
# See http://bugs.python.org/issue29271 for details:
asyncio.set_event_loop(self.loop)
try:
- with self.assertWarns(PendingDeprecationWarning):
+ with self.assertWarns(DeprecationWarning):
self.assertEqual(Task.all_tasks(), {task})
- with self.assertWarns(PendingDeprecationWarning):
+ with self.assertWarns(DeprecationWarning):
self.assertEqual(Task.all_tasks(None), {task})
finally:
asyncio.set_event_loop(None)
@@ -2692,7 +2692,7 @@
self.assertEqual(asyncio.all_tasks(loop), set())
self._register_task(task)
self.assertEqual(asyncio.all_tasks(loop), set())
- with self.assertWarns(PendingDeprecationWarning):
+ with self.assertWarns(DeprecationWarning):
self.assertEqual(asyncio.Task.all_tasks(loop), {task})
self._unregister_task(task)