Merged revisions 82980 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ........ r82980 | stefan.krah | 2010-07-19 20:06:46 +0200 (Mon, 19 Jul 2010) | 3 lines Sub-issue of #9036: Fix incorrect use of Py_CHARMASK. ........
This commit is contained in:
parent
200888fea3
commit
ae7dd8fab0
|
@ -392,6 +392,7 @@ class UnicodeTest(
|
|||
|
||||
self.assertEqual(u'%c' % 0x1234, u'\u1234')
|
||||
self.assertRaises(OverflowError, u"%c".__mod__, (sys.maxunicode+1,))
|
||||
self.assertRaises(ValueError, u"%.1\u1032f".__mod__, (1.0/3))
|
||||
|
||||
for num in range(0x00,0x80):
|
||||
char = chr(num)
|
||||
|
|
|
@ -8607,7 +8607,7 @@ PyObject *PyUnicode_Format(PyObject *format,
|
|||
else if (c >= '0' && c <= '9') {
|
||||
prec = c - '0';
|
||||
while (--fmtcnt >= 0) {
|
||||
c = Py_CHARMASK(*fmt++);
|
||||
c = *fmt++;
|
||||
if (c < '0' || c > '9')
|
||||
break;
|
||||
if ((prec*10) / 10 != prec) {
|
||||
|
|
Loading…
Reference in New Issue