Mercurial > cpython-lru_cache-weakref

diff Modules/_tkinter.c @ 85793:5c1c67d980bb 3.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Issue #19028: Fixed tkinter.Tkapp.merge() for non-string arguments.
author Serhiy Storchaka <storchaka@gmail.com>
date Mon, 23 Sep 2013 23:20:07 +0300
parents 08c45e18e7b2
children 35da5d848ffd
line wrap: on
line diff
--- a/Modules/_tkinter.c	Sun Sep 22 11:45:52 2013 +0200
+++ b/Modules/_tkinter.c	Mon Sep 23 23:20:07 2013 +0300
@@ -331,17 +331,8 @@
 {
     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 @@
             return NULL;
         }
         Py_DECREF(v);
-        return PyBytes_AsString(v);
+        return PyUnicode_AsUTF8(v);
     }
 }