diff options
| author | Michael W. Hudson <mwh@python.net> | 2002-01-28 15:14:57 (GMT) |
|---|---|---|
| committer | Michael W. Hudson <mwh@python.net> | 2002-01-28 15:14:57 (GMT) |
| commit | fbfb20efaed0455da5b2db3aeb31e255233844e3 (patch) | |
| tree | a557c050ba6df58d755b2711bd9c748047bb3a2d /Modules | |
| parent | 23d65ff4e4821bb4afc5eee49634685edc5f1894 (diff) | |
| download | cpython-fbfb20efaed0455da5b2db3aeb31e255233844e3.zip cpython-fbfb20efaed0455da5b2db3aeb31e255233844e3.tar.gz cpython-fbfb20efaed0455da5b2db3aeb31e255233844e3.tar.bz2 | |
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.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_tkinter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index 44f6420..ba0a383 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); } |