mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge 3.6 (issue #28544)

Browse source
This commit is contained in:
Yury Selivanov 2016-10-28 19:01:46 -04:00
commit f0bbee6228
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Modules/_asynciomodule.c
View file

@ -21,7 +21,7 @@ _Py_IDENTIFIER(_wakeup);
/* State of the _asyncio module */
static PyObject *all_tasks;
static PyDictObject *current_tasks;
static PyObject *current_tasks;
static PyObject *traceback_extract_stack;
static PyObject *asyncio_get_event_loop;
static PyObject *asyncio_future_repr_info_func;
@ -1429,11 +1429,11 @@ _asyncio_Task_current_task_impl(PyTypeObject *type, PyObject *loop)
return NULL;
}
res = PyDict_GetItem((PyObject*)current_tasks, loop);
res = PyDict_GetItem(current_tasks, loop);
Py_DECREF(loop);
}
else {
res = PyDict_GetItem((PyObject*)current_tasks, loop);
res = PyDict_GetItem(current_tasks, loop);
}
if (res == NULL) {
@ -2235,7 +2235,7 @@ task_step(TaskObj *task, PyObject *exc)
PyObject *res;
PyObject *ot;
if (PyDict_SetItem((PyObject *)current_tasks,
if (PyDict_SetItem(current_tasks,
task->task_loop, (PyObject*)task) == -1)
{
return NULL;
@ -2385,7 +2385,7 @@ module_init(void)
goto fail;
}
current_tasks = (PyDictObject *)PyDict_New();
current_tasks = PyDict_New();
if (current_tasks == NULL) {
goto fail;
}