diff -r 78c66450de74 Objects/unicodeobject.c
--- a/Objects/unicodeobject.c	Thu Jun 30 23:45:01 2011 +0200
+++ b/Objects/unicodeobject.c	Fri Jul 01 23:04:26 2011 +0200
@@ -9761,8 +9761,6 @@
             case 'o':
             case 'x':
             case 'X':
-                if (c == 'i')
-                    c = 'd';
                 isnumok = 0;
                 if (PyNumber_Check(v)) {
                     PyObject *iobj=NULL;
@@ -9777,7 +9775,7 @@
                     if (iobj!=NULL) {
                         if (PyLong_Check(iobj)) {
                             isnumok = 1;
-                            temp = formatlong(iobj, flags, prec, c);
+                            temp = formatlong(iobj, flags, prec, (c == 'i'? 'd': c));
                             Py_DECREF(iobj);
                             if (!temp)
                                 goto onError;