summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-10-09 15:26:41 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-10-09 15:26:41 (GMT)
commitae136da881bc185d7d4522518dffa870fc6518f4 (patch)
treed353ac350a1136cdb5999582cd8376b4640ebcce /Modules
parentf6c6e44eef80baa28afd9a0fb95998ef5d560659 (diff)
downloadcpython-ae136da881bc185d7d4522518dffa870fc6518f4.zip
cpython-ae136da881bc185d7d4522518dffa870fc6518f4.tar.gz
cpython-ae136da881bc185d7d4522518dffa870fc6518f4.tar.bz2
Merged revisions 85342 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85342 | antoine.pitrou | 2010-10-09 17:24:28 +0200 (sam., 09 oct. 2010) | 4 lines Issue #10055: Make json C89-compliant in UCS4 mode. ........
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_json.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_json.c b/Modules/_json.c
index 2e39525..4da5e74 100644
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -430,8 +430,8 @@ scanstring_unicode(PyObject *pystr, Py_ssize_t end, int strict, Py_ssize_t *next
end += 6;
/* Decode 4 hex digits */
for (; next < end; next++) {
- c2 <<= 4;
Py_UNICODE digit = buf[next];
+ c2 <<= 4;
switch (digit) {
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':