traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Stefan Krah 2010-07-19 18:24:18 +00:00
parent 200888fea3
commit ae7dd8fab0
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Lib/test/test_unicode.py
View File

@ -392,6 +392,7 @@ class UnicodeTest(
self.assertEqual(u'%c' % 0x1234, u'\u1234') self.assertEqual(u'%c' % 0x1234, u'\u1234')
self.assertRaises(OverflowError, u"%c".__mod__, (sys.maxunicode+1,)) 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): for num in range(0x00,0x80):
char = chr(num) char = chr(num)

2
Objects/unicodeobject.c
View File

@ -8607,7 +8607,7 @@ PyObject *PyUnicode_Format(PyObject *format,
else if (c >= '0' && c <= '9') { else if (c >= '0' && c <= '9') {
prec = c - '0'; prec = c - '0';
while (--fmtcnt >= 0) { while (--fmtcnt >= 0) {
c = Py_CHARMASK(*fmt++); c = *fmt++;
if (c < '0' || c > '9') if (c < '0' || c > '9')
break; break;
if ((prec*10) / 10 != prec) { if ((prec*10) / 10 != prec) {