[Python-checkins] python/dist/src/Objects stringobject.c, 2.232, 2.233

[birkenfeld@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Objects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7536/Objects

Modified Files:
	stringobject.c 
Log Message:
Fix PyString_Format so that the "%s" format works again when Unicode is not
enabled.



Index: stringobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.232
retrieving revision 2.233
diff -u -d -r2.232 -r2.233
--- stringobject.c	31 Aug 2005 23:02:05 -0000	2.232
+++ stringobject.c	1 Oct 2005 17:06:00 -0000	2.233
@@ -4083,7 +4083,9 @@
 					argidx = argidx_start;
 					goto unicode;
 				}
+#endif
 				temp = _PyObject_Str(v);
+#ifdef Py_USING_UNICODE
 				if (temp != NULL && PyUnicode_Check(temp)) {
 					Py_DECREF(temp);
 					fmt = fmt_start;