Skip to content

bpo-34270: Fixed inconsistency in string handling in the Task C implementation #8717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1st1 merged 1 commit into from
Aug 9, 2018
Merged

bpo-34270: Fixed inconsistency in string handling in the Task C implementation #8717

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions Modules/_asynciomodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1976,7 +1976,7 @@ _asyncio_Task___init___impl(TaskObj *self, PyObject *coro, PyObject *loop,

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

Py_XSETREF(self->task_name, name);
Py_XSETREF(self->task_name, value);
Py_RETURN_NONE;
}

Expand Down