traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

asyncio: PendingDeprecationWarning -> DeprecationWarning (GH-12494) 

`Task.current_task()` and `Task.all_tasks()` will be removed in 3.9.
This commit is contained in:
Inada Naoki 2019-03-22 20:07:32 +09:00 committed by Miss Islington (bot)
parent b0df45e55d
commit c5c6cdada3
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/asyncio/tasks.py
View File

@ -97,7 +97,7 @@ class Task(futures._PyFuture): # Inherit Python Task implementation
""" """
warnings.warn("Task.current_task() is deprecated, " warnings.warn("Task.current_task() is deprecated, "
"use asyncio.current_task() instead", "use asyncio.current_task() instead",
PendingDeprecationWarning, DeprecationWarning,
stacklevel=2) stacklevel=2)
if loop is None: if loop is None:
loop = events.get_event_loop() loop = events.get_event_loop()
@ -111,7 +111,7 @@ class Task(futures._PyFuture): # Inherit Python Task implementation
""" """
warnings.warn("Task.all_tasks() is deprecated, " warnings.warn("Task.all_tasks() is deprecated, "
"use asyncio.all_tasks() instead", "use asyncio.all_tasks() instead",
PendingDeprecationWarning, DeprecationWarning,
stacklevel=2) stacklevel=2)
return _all_tasks_compat(loop) return _all_tasks_compat(loop)

18
Lib/test/test_asyncio/test_tasks.py
View File

@ -1634,26 +1634,26 @@ class BaseTaskTests:
def test_current_task_deprecated(self): def test_current_task_deprecated(self):
Task = self.__class__.Task Task = self.__class__.Task
with self.assertWarns(PendingDeprecationWarning): with self.assertWarns(DeprecationWarning):
self.assertIsNone(Task.current_task(loop=self.loop)) self.assertIsNone(Task.current_task(loop=self.loop))
async def coro(loop): async def coro(loop):
with self.assertWarns(PendingDeprecationWarning): with self.assertWarns(DeprecationWarning):
self.assertIs(Task.current_task(loop=loop), task) self.assertIs(Task.current_task(loop=loop), task)
# See http://bugs.python.org/issue29271 for details: # See http://bugs.python.org/issue29271 for details:
asyncio.set_event_loop(loop) asyncio.set_event_loop(loop)
try: try:
with self.assertWarns(PendingDeprecationWarning): with self.assertWarns(DeprecationWarning):
self.assertIs(Task.current_task(None), task) self.assertIs(Task.current_task(None), task)
with self.assertWarns(PendingDeprecationWarning): with self.assertWarns(DeprecationWarning):
self.assertIs(Task.current_task(), task) self.assertIs(Task.current_task(), task)
finally: finally:
asyncio.set_event_loop(None) asyncio.set_event_loop(None)
task = self.new_task(self.loop, coro(self.loop)) task = self.new_task(self.loop, coro(self.loop))
self.loop.run_until_complete(task) self.loop.run_until_complete(task)
with self.assertWarns(PendingDeprecationWarning): with self.assertWarns(DeprecationWarning):
self.assertIsNone(Task.current_task(loop=self.loop)) self.assertIsNone(Task.current_task(loop=self.loop))
def test_current_task(self): def test_current_task(self):
@ -1982,7 +1982,7 @@ class BaseTaskTests:
Task = self.__class__.Task Task = self.__class__.Task
async def coro(): async def coro():
with self.assertWarns(PendingDeprecationWarning): with self.assertWarns(DeprecationWarning):
assert Task.all_tasks(self.loop) == {t} assert Task.all_tasks(self.loop) == {t}
t = self.new_task(self.loop, coro()) t = self.new_task(self.loop, coro())
@ -2012,9 +2012,9 @@ class BaseTaskTests:
# See http://bugs.python.org/issue29271 for details: # See http://bugs.python.org/issue29271 for details:
asyncio.set_event_loop(self.loop) asyncio.set_event_loop(self.loop)
try: try:
with self.assertWarns(PendingDeprecationWarning): with self.assertWarns(DeprecationWarning):
self.assertEqual(Task.all_tasks(), {task}) self.assertEqual(Task.all_tasks(), {task})
with self.assertWarns(PendingDeprecationWarning): with self.assertWarns(DeprecationWarning):
self.assertEqual(Task.all_tasks(None), {task}) self.assertEqual(Task.all_tasks(None), {task})
finally: finally:
asyncio.set_event_loop(None) asyncio.set_event_loop(None)
@ -2692,7 +2692,7 @@ class BaseTaskIntrospectionTests:
self.assertEqual(asyncio.all_tasks(loop), set()) self.assertEqual(asyncio.all_tasks(loop), set())
self._register_task(task) self._register_task(task)
self.assertEqual(asyncio.all_tasks(loop), set()) self.assertEqual(asyncio.all_tasks(loop), set())
with self.assertWarns(PendingDeprecationWarning): with self.assertWarns(DeprecationWarning):
self.assertEqual(asyncio.Task.all_tasks(loop), {task}) self.assertEqual(asyncio.Task.all_tasks(loop), {task})
self._unregister_task(task) self._unregister_task(task)

4
Modules/_asynciomodule.c
View File

@ -2088,7 +2088,7 @@ _asyncio_Task_current_task_impl(PyTypeObject *type, PyObject *loop)
PyObject *ret; PyObject *ret;
PyObject *current_task_func; PyObject *current_task_func;
if (PyErr_WarnEx(PyExc_PendingDeprecationWarning, if (PyErr_WarnEx(PyExc_DeprecationWarning,
"Task.current_task() is deprecated, " \ "Task.current_task() is deprecated, " \
"use asyncio.current_task() instead", "use asyncio.current_task() instead",
1) < 0) { 1) < 0) {
@ -2136,7 +2136,7 @@ _asyncio_Task_all_tasks_impl(PyTypeObject *type, PyObject *loop)
PyObject *res; PyObject *res;
PyObject *all_tasks_func; PyObject *all_tasks_func;
if (PyErr_WarnEx(PyExc_PendingDeprecationWarning, if (PyErr_WarnEx(PyExc_DeprecationWarning,
"Task.all_tasks() is deprecated, " \ "Task.all_tasks() is deprecated, " \
"use asyncio.all_tasks() instead", "use asyncio.all_tasks() instead",
1) < 0) { 1) < 0) {