[Python-checkins] cpython (merge 3.2 -> default): merge from 3.2

[senthil.kumaran]

http://hg.python.org/cpython/rev/7ac6397a6308
changeset:   71182:7ac6397a6308
parent:      71180:078d91fc6b3b
parent:      71181:97707459bb5a
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Sun Jul 03 21:05:25 2011 -0700
summary:
  merge from 3.2

files:
  Lib/test/test_unicode.py |  1 +
  Objects/unicodeobject.c  |  4 +---
  2 files changed, 2 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -788,6 +788,7 @@
         self.assertEqual('%c' % '\U00021483', '\U00021483')
         self.assertRaises(TypeError, "%c".__mod__, "aa")
         self.assertRaises(ValueError, "%.1\u1032f".__mod__, (1.0/3))
+        self.assertRaises(TypeError, "%i".__mod__, "aa")
 
         # formatting jobs delegated from the string implementation:
         self.assertEqual('...%(foo)s...' % {'foo':"abc"}, '...abc...')
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -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;

-- 
Repository URL: http://hg.python.org/cpython