summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorStefan Krah <stefan@bytereef.org>2010-07-19 18:01:13 (GMT)
committerStefan Krah <stefan@bytereef.org>2010-07-19 18:01:13 (GMT)
commitaebd6f4c298e4018f8ad3be98815be61f95ba10f (patch)
treec1d22d69b8bb2ff7387c55415e36e9b99a51161c /Objects
parent8db99c899591ecfe49405334a6e21bfa46ec8ef6 (diff)
downloadcpython-aebd6f4c298e4018f8ad3be98815be61f95ba10f.zip
cpython-aebd6f4c298e4018f8ad3be98815be61f95ba10f.tar.gz
cpython-aebd6f4c298e4018f8ad3be98815be61f95ba10f.tar.bz2
Merged revisions 82978 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r82978 | stefan.krah | 2010-07-19 19:58:26 +0200 (Mon, 19 Jul 2010) | 3 lines Sub-issue of #9036: Fix incorrect use of Py_CHARMASK. ........
Diffstat (limited to 'Objects')
-rw-r--r--Objects/unicodeobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index db77b8a..199f34a 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -9304,7 +9304,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) {