[Python-checkins] CVS: python/dist/src/Modules _tkinter.c,1.121,1.121.6.1

2002年1月28日 07:14:59 -0800

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv1527
Modified Files:
 Tag: release22-maint
	_tkinter.c 
Log Message:
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.
Index: _tkinter.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_tkinter.c,v
retrieving revision 1.121
retrieving revision 1.121.6.1
diff -C2 -d -r1.121 -r1.121.6.1
*** _tkinter.c	2001年12月09日 23:15:56	1.121
--- _tkinter.c	2002年01月28日 15:14:57	1.121.6.1
***************
*** 1192,1196 ****
 	int i;

! 	if (!PyArg_ParseTuple(args, "s:splitlist", &list))
 		return NULL;

--- 1192,1196 ----
 	int i;

! 	if (!PyArg_ParseTuple(args, "et:splitlist", "utf-8", &list))
 		return NULL;

***************
*** 1220,1224 ****
 	char *list;

! 	if (!PyArg_ParseTuple(args, "s:split", &list))
 		return NULL;
 	return Split(list);
--- 1220,1224 ----
 	char *list;

! 	if (!PyArg_ParseTuple(args, "et:split", "utf-8", &list))
 		return NULL;
 	return Split(list);