diff options
author | Alex Grönholm <alex.gronholm@nextday.fi> | 2019-05-30 15:30:09 (GMT) |
---|---|---|
committer | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-05-30 15:30:09 (GMT) |
commit | 98ef92002ec289bf8086b0ef3d4f96c2589f4e68 (patch) | |
tree | 0c3420f69cef6e0c306af7508fdd06415b39a853 | |
parent | 25ee0c3bf10820496448e2886069f9c2794be7ac (diff) | |
download | cpython-98ef92002ec289bf8086b0ef3d4f96c2589f4e68.zip cpython-98ef92002ec289bf8086b0ef3d4f96c2589f4e68.tar.gz cpython-98ef92002ec289bf8086b0ef3d4f96c2589f4e68.tar.bz2 |
bpo-36999: Add asyncio.Task.get_coro() (GH-13680)
https://bugs.python.org/issue36999
-rw-r--r-- | Doc/library/asyncio-task.rst | 6 | ||||
-rw-r--r-- | Lib/asyncio/tasks.py | 3 | ||||
-rw-r--r-- | Lib/test/test_asyncio/test_tasks.py | 10 | ||||
-rw-r--r-- | Misc/NEWS.d/next/Library/2019-05-30-13-30-46.bpo-36999.EjY_L2.rst | 2 | ||||
-rw-r--r-- | Modules/_asynciomodule.c | 13 | ||||
-rw-r--r-- | Modules/clinic/_asynciomodule.c.h | 19 |
6 files changed, 52 insertions, 1 deletions
diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst index d94fa58..1fcdcb9 100644 --- a/Doc/library/asyncio-task.rst +++ b/Doc/library/asyncio-task.rst @@ -842,6 +842,12 @@ Task Object The *file* argument is an I/O stream to which the output is written; by default output is written to :data:`sys.stderr`. + .. method:: get_coro() + + Return the coroutine object wrapped by the :class:`Task`. + + .. versionadded:: 3.8 + .. method:: get_name() Return the name of the Task. diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py index 78e7600..95e8560 100644 --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -152,6 +152,9 @@ class Task(futures._PyFuture): # Inherit Python Task implementation def _repr_info(self): return base_tasks._task_repr_info(self) + def get_coro(self): + return self._coro + def get_name(self): return self._name diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py index 114dd76..74ce259 100644 --- a/Lib/test/test_asyncio/test_tasks.py +++ b/Lib/test/test_asyncio/test_tasks.py @@ -2425,6 +2425,16 @@ class BaseTaskTests: self.assertEqual(cvar.get(), -1) + def test_get_coro(self): + loop = asyncio.new_event_loop() + coro = coroutine_function() + try: + task = self.new_task(loop, coro) + loop.run_until_complete(task) + self.assertIs(task.get_coro(), coro) + finally: + loop.close() + def add_subclass_tests(cls): BaseTask = cls.Task diff --git a/Misc/NEWS.d/next/Library/2019-05-30-13-30-46.bpo-36999.EjY_L2.rst b/Misc/NEWS.d/next/Library/2019-05-30-13-30-46.bpo-36999.EjY_L2.rst new file mode 100644 index 0000000..5c897fb --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-05-30-13-30-46.bpo-36999.EjY_L2.rst @@ -0,0 +1,2 @@ +Add the ``asyncio.Task.get_coro()`` method to publicly expose the tasks's +coroutine object. diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c index d8b631b..281161b 100644 --- a/Modules/_asynciomodule.c +++ b/Modules/_asynciomodule.c @@ -2314,6 +2314,18 @@ _asyncio_Task_set_exception(TaskObj *self, PyObject *exception) } /*[clinic input] +_asyncio.Task.get_coro +[clinic start generated code]*/ + +static PyObject * +_asyncio_Task_get_coro_impl(TaskObj *self) +/*[clinic end generated code: output=bcac27c8cc6c8073 input=d2e8606c42a7b403]*/ +{ + Py_INCREF(self->task_coro); + return self->task_coro; +} + +/*[clinic input] _asyncio.Task.get_name [clinic start generated code]*/ @@ -2439,6 +2451,7 @@ static PyMethodDef TaskType_methods[] = { _ASYNCIO_TASK__REPR_INFO_METHODDEF _ASYNCIO_TASK_GET_NAME_METHODDEF _ASYNCIO_TASK_SET_NAME_METHODDEF + _ASYNCIO_TASK_GET_CORO_METHODDEF {NULL, NULL} /* Sentinel */ }; diff --git a/Modules/clinic/_asynciomodule.c.h b/Modules/clinic/_asynciomodule.c.h index 87669f7..b9daee6 100644 --- a/Modules/clinic/_asynciomodule.c.h +++ b/Modules/clinic/_asynciomodule.c.h @@ -569,6 +569,23 @@ PyDoc_STRVAR(_asyncio_Task_set_exception__doc__, #define _ASYNCIO_TASK_SET_EXCEPTION_METHODDEF \ {"set_exception", (PyCFunction)_asyncio_Task_set_exception, METH_O, _asyncio_Task_set_exception__doc__}, +PyDoc_STRVAR(_asyncio_Task_get_coro__doc__, +"get_coro($self, /)\n" +"--\n" +"\n"); + +#define _ASYNCIO_TASK_GET_CORO_METHODDEF \ + {"get_coro", (PyCFunction)_asyncio_Task_get_coro, METH_NOARGS, _asyncio_Task_get_coro__doc__}, + +static PyObject * +_asyncio_Task_get_coro_impl(TaskObj *self); + +static PyObject * +_asyncio_Task_get_coro(TaskObj *self, PyObject *Py_UNUSED(ignored)) +{ + return _asyncio_Task_get_coro_impl(self); +} + PyDoc_STRVAR(_asyncio_Task_get_name__doc__, "get_name($self, /)\n" "--\n" @@ -815,4 +832,4 @@ _asyncio__leave_task(PyObject *module, PyObject *const *args, Py_ssize_t nargs, exit: return return_value; } -/*[clinic end generated code: output=e3b02d96da56e80c input=a9049054013a1b77]*/ +/*[clinic end generated code: output=51c50219f6a0863a input=a9049054013a1b77]*/ |