[Python-checkins] CVS: python/dist/src/Objects unicodeobject.c,2.120,2.121
M.-A. Lemburg
lemburg@users.sourceforge.net
2001年11月20日 07:18:51 -0800
Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv16750/Objects
Modified Files:
unicodeobject.c
Log Message:
Fix for bug #438164: %-formatting using Unicode objects.
This patch also does away with an incompatibility between Jython
and CPython.
Index: unicodeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v
retrieving revision 2.120
retrieving revision 2.121
diff -C2 -d -r2.120 -r2.121
*** unicodeobject.c 2001年10月19日 12:02:29 2.120
--- unicodeobject.c 2001年11月20日 15:18:49 2.121
***************
*** 5301,5304 ****
--- 5301,5305 ----
goto onError;
}
+ #if 0
/* keys are converted to strings using UTF-8 and
then looked up since Python uses strings to hold
***************
*** 5308,5311 ****
--- 5309,5315 ----
keylen,
NULL);
+ #else
+ key = PyUnicode_FromUnicode(keystart, keylen);
+ #endif
if (key == NULL)
goto onError;