From 369606df2f9235e8e9bce1feabf1ac48c889f8d5 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Mon, 23 Sep 2013 23:20:07 +0300 Subject: Issue #19028: Fixed tkinter.Tkapp.merge() for non-string arguments. --- Modules/_tkinter.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'Modules') diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index 1350ff5cb9..ecad541b95 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -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); } } -- cgit v1.2.1