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

Fixed inconsistency in string handling in the Task C implementation (GH-8717)

This commit is contained in:
Alex Grönholm 2018-08-09 23:49:49 +03:00 committed by Yury Selivanov
parent 22d131a7f9
commit a7548230ff
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Modules/_asynciomodule.c
View File

@ -1976,7 +1976,7 @@ _asyncio_Task___init___impl(TaskObj *self, PyObject *coro, PyObject *loop,
if (name == Py_None) { if (name == Py_None) {
name = PyUnicode_FromFormat("Task-%" PRIu64, ++task_name_counter); name = PyUnicode_FromFormat("Task-%" PRIu64, ++task_name_counter);
} else if (!PyUnicode_Check(name)) { } else if (!PyUnicode_CheckExact(name)) {
name = PyObject_Str(name); name = PyObject_Str(name);
} else { } else {
Py_INCREF(name); Py_INCREF(name);
@ -2343,12 +2343,16 @@ static PyObject *
_asyncio_Task_set_name(TaskObj *self, PyObject *value) _asyncio_Task_set_name(TaskObj *self, PyObject *value)
/*[clinic end generated code: output=138a8d51e32057d6 input=a8359b6e65f8fd31]*/ /*[clinic end generated code: output=138a8d51e32057d6 input=a8359b6e65f8fd31]*/
{ {
PyObject *name = PyObject_Str(value); if (!PyUnicode_CheckExact(value)) {
if (name == NULL) { value = PyObject_Str(value);
return NULL; if (value == NULL) {
return NULL;
}
} else {
Py_INCREF(value);
} }
Py_XSETREF(self->task_name, name); Py_XSETREF(self->task_name, value);
Py_RETURN_NONE; Py_RETURN_NONE;
} }