[Python-checkins] Fixed inconsistency in string handling in the Task C implementation (GH-8717)
Yury Selivanov
webhook-mailer at python.org
Thu Aug 9 16:49:53 EDT 2018
https://github.com/python/cpython/commit/a7548230ff6db5008c76e97f2597ebfdb41da19d
commit: a7548230ff6db5008c76e97f2597ebfdb41da19d
branch: master
author: Alex Grönholm <alex.gronholm at nextday.fi>
committer: Yury Selivanov <yury at magic.io>
date: 2018-08-09T16:49:49-04:00
summary:
Fixed inconsistency in string handling in the Task C implementation (GH-8717)
files:
M Modules/_asynciomodule.c
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
index 3c94848e3318..3d7ce01a680c 100644
--- a/Modules/_asynciomodule.c
+++ b/Modules/_asynciomodule.c
@@ -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);
@@ -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;
}
More information about the Python-checkins
mailing list