Kaydet (Commit) fbfb20ef authored tarafından Michael W. Hudson's avatar Michael W. Hudson

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.
üst 23d65ff4
......@@ -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);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment