mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

merge from 3.2

Browse source
This commit is contained in:
Senthil Kumaran 2011-07-03 21:05:25 -07:00
commit bc9d8f838b
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Lib/test/test_unicode.py
View file

@ -788,6 +788,7 @@ class UnicodeTest(string_tests.CommonTest,
self.assertEqual('%c' % '\U00021483', '\U00021483') self.assertEqual('%c' % '\U00021483', '\U00021483')
self.assertRaises(TypeError, "%c".__mod__, "aa") self.assertRaises(TypeError, "%c".__mod__, "aa")
self.assertRaises(ValueError, "%.1\u1032f".__mod__, (1.0/3)) self.assertRaises(ValueError, "%.1\u1032f".__mod__, (1.0/3))
self.assertRaises(TypeError, "%i".__mod__, "aa")
# formatting jobs delegated from the string implementation: # formatting jobs delegated from the string implementation:
self.assertEqual('...%(foo)s...' % {'foo':"abc"}, '...abc...') self.assertEqual('...%(foo)s...' % {'foo':"abc"}, '...abc...')

4
Objects/unicodeobject.c
View file

@ -9761,8 +9761,6 @@ PyUnicode_Format(PyObject *format, PyObject *args)
case 'o': case 'o':
case 'x': case 'x':
case 'X': case 'X':
if (c == 'i')
c = 'd';
isnumok = 0; isnumok = 0;
if (PyNumber_Check(v)) { if (PyNumber_Check(v)) {
PyObject *iobj=NULL; PyObject *iobj=NULL;
@ -9777,7 +9775,7 @@ PyUnicode_Format(PyObject *format, PyObject *args)
if (iobj!=NULL) { if (iobj!=NULL) {
if (PyLong_Check(iobj)) { if (PyLong_Check(iobj)) {
isnumok = 1; isnumok = 1;
temp = formatlong(iobj, flags, prec, c); temp = formatlong(iobj, flags, prec, (c == 'i'? 'd': c));
Py_DECREF(iobj); Py_DECREF(iobj);
if (!temp) if (!temp)
goto onError; goto onError;