Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Stefan Krah 2010-07-19 17:58:26 +00:00
parent 9542cc6eb5
commit 99212f61db
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

@ -757,6 +757,7 @@ class UnicodeTest(string_tests.CommonTest,
self.assertRaises(OverflowError, "%c".__mod__, (0x110000,))
self.assertEqual('%c' % '\U00021483', '\U00021483')
self.assertRaises(TypeError, "%c".__mod__, "aa")
self.assertRaises(ValueError, "%.1\u1032f".__mod__, (1.0/3))
# formatting jobs delegated from the string implementation:
self.assertEqual('...%(foo)s...' % {'foo':"abc"}, '...abc...')

2
Objects/unicodeobject.c
View File

@ -9242,7 +9242,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) {