commit 9ebe08d2f6c3b8bca5148e909cc89efeb7a01ad1
author Senthil Kumaran <senthil@uthcode.com> Sun Jul 03 21:03:16 2011 -0700
committer Senthil Kumaran <senthil@uthcode.com> Sun Jul 03 21:03:16 2011 -0700
tree 14b187f19e9c85236091dd81dcfabcfcd4db3682
parent a55007a620792a6dff946ee04b1295689e70b616

Fix closes issue12471 - wrong TypeError message when '%i' format spec was used.

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 7a70a5e..03807a4 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -9689,8 +9689,6 @@
             case 'o':
             case 'x':
             case 'X':
-                if (c == 'i')
-                    c = 'd';
                 isnumok = 0;
                 if (PyNumber_Check(v)) {
                     PyObject *iobj=NULL;
@@ -9705,7 +9703,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;