diff options
| author | Stefan Krah <stefan@bytereef.org> | 2010-07-19 18:24:18 (GMT) |
|---|---|---|
| committer | Stefan Krah <stefan@bytereef.org> | 2010-07-19 18:24:18 (GMT) |
| commit | ae7dd8fab0d49dd3e1cf71ae64ec8a386cf2061c (patch) | |
| tree | 03e466c04905c5b356323942a0597391685d9827 | |
| parent | 200888fea3efce24b32cdbaab254090b19be8d4e (diff) | |
| download | cpython-ae7dd8fab0d49dd3e1cf71ae64ec8a386cf2061c.zip cpython-ae7dd8fab0d49dd3e1cf71ae64ec8a386cf2061c.tar.gz cpython-ae7dd8fab0d49dd3e1cf71ae64ec8a386cf2061c.tar.bz2 | |
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.
........
| -rw-r--r-- | Lib/test/test_unicode.py | 1 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py index 43d8c5d..53c7800 100644 --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -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) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index d056855..571f607 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -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) { |