From: Michael W. Hudson <mwh@python.net>
Date: Mon, 28 Jan 2002 15:14:57 +0000 (+0000)
Subject: It's merge time!
X-Git-Tag: v2.2.1c1~224
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fbfb20efaed0455da5b2db3aeb31e255233844e3;p=thirdparty%2FPython%2Fcpython.git

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 44f6420c715b..ba0a383170f1 100644
--- 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);
 }