commit 0b9201fa1cf87af559e8bbe38082df9d834ef353
author Stefan Krah <stefan@bytereef.org> Mon Jul 19 18:06:46 2010 +0000
committer Stefan Krah <stefan@bytereef.org> Mon Jul 19 18:06:46 2010 +0000
tree 30913eb8de93a36f2a4fe14ed26729f64795786e
parent c7743aaac3b318c3e4c8583d8b1e5f3be267d119

Sub-issue of #9036: Fix incorrect use of Py_CHARMASK.

Lib/test/test_unicode.py

diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 8d52492..1151e86 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -394,6 +394,7 @@
 
         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)

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index b182927..81b62e4 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -8417,7 +8417,7 @@
                 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) {