mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #19028: Fixed tkinter.Tkapp.merge() for non-string arguments.

Browse source
This commit is contained in:
Serhiy Storchaka 2013-09-23 23:20:07 +03:00
parent 587b30571d
commit 369606df2f
3 changed files with 36 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Modules/_tkinter.c
View file

@ -331,17 +331,8 @@ AsString(PyObject *value, PyObject *tmp)
{
if (PyBytes_Check(value))
return PyBytes_AsString(value);
else if (PyUnicode_Check(value)) {
PyObject *v = PyUnicode_AsUTF8String(value);
if (v == NULL)
return NULL;
if (PyList_Append(tmp, v) != 0) {
Py_DECREF(v);
return NULL;
}
Py_DECREF(v);
return PyBytes_AsString(v);
}
else if (PyUnicode_Check(value))
return PyUnicode_AsUTF8(value);
else {
PyObject *v = PyObject_Str(value);
if (v == NULL)
@ -351,7 +342,7 @@ AsString(PyObject *value, PyObject *tmp)
return NULL;
}
Py_DECREF(v);
return PyBytes_AsString(v);
return PyUnicode_AsUTF8(v);
}
}