It's merge time!

Backport loewis' checkin of revision 1.123:

Encode Unicode arguments to split/splitlist as UTF-8. Fixes #507962.
2.2.1 bugfix candidate.

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 44f6420c715bfc3fe1bb72e7382427da2af57c88..ba0a383170f13e8de4ff53fe46df7057f14c7e69 100644 (file)
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -1191,7 +1191,7 @@ Tkapp_SplitList(PyObject *self, PyObject *args)
        PyObject *v;
        int i;
 
-       if (!PyArg_ParseTuple(args, "s:splitlist", &list))
+       if (!PyArg_ParseTuple(args, "et:splitlist", "utf-8", &list))
                return NULL;
 
        if (Tcl_SplitList(Tkapp_Interp(self), list, &argc, &argv) == TCL_ERROR)
@@ -1219,7 +1219,7 @@ Tkapp_Split(PyObject *self, PyObject *args)
 {
        char *list;
 
-       if (!PyArg_ParseTuple(args, "s:split", &list))
+       if (!PyArg_ParseTuple(args, "et:split", "utf-8", &list))
                return NULL;
        return Split(list);
 }