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

diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 8d524926b89fd6707a0d060472a843b12a10749a..1151e867a4d667b470121e9ff3a6dcf3e12a8e76 100644 (file)
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -394,6 +394,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 b18292791107def405fae8d53deb9a9a15f44b62..81b62e4fd84caecdb4c28e21d907efbe4dcefd42 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -8417,7 +8417,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) {