[Python-checkins] python/dist/src/Objects stringobject.c, 2.231, 2.232
nascheme@users.sourceforge.net
nascheme at users.sourceforge.net
Thu Sep 1 01:02:17 CEST 2005
Update of /cvsroot/python/python/dist/src/Objects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10493/Objects
Modified Files:
stringobject.c
Log Message:
Fix bug in last checkin (2.231). To match previous behavior, unicode
subclasses should be substituted as-is and not have tp_str called on
them.
Index: stringobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.231
retrieving revision 2.232
diff -u -d -r2.231 -r2.232
--- stringobject.c 12 Aug 2005 17:34:57 -0000 2.231
+++ stringobject.c 31 Aug 2005 23:02:05 -0000 2.232
@@ -4078,6 +4078,11 @@
break;
case 's':
#ifdef Py_USING_UNICODE
+ if (PyUnicode_Check(v)) {
+ fmt = fmt_start;
+ argidx = argidx_start;
+ goto unicode;
+ }
temp = _PyObject_Str(v);
if (temp != NULL && PyUnicode_Check(temp)) {
Py_DECREF(temp);
More information about the Python-checkins
mailing list