[Python-checkins] r85343 - in python/branches/release31-maint: Misc/NEWS Modules/_json.c

[antoine.pitrou]

Author: antoine.pitrou
Date: Sat Oct  9 17:26:41 2010
New Revision: 85343

Log:
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.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/Modules/_json.c

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Sat Oct  9 17:26:41 2010
@@ -600,6 +600,8 @@
 Build
 -----
 
+- Issue #10055: Make json C89-compliant in UCS4 mode.
+
 - Issue #6244: Allow detect_tkinter to look for Tcl/Tk 8.6.
 
 - Issue #1633863: Don't ignore $CC under AIX.

Modified: python/branches/release31-maint/Modules/_json.c
==============================================================================
--- python/branches/release31-maint/Modules/_json.c	(original)
+++ python/branches/release31-maint/Modules/_json.c	Sat Oct  9 17:26:41 2010
@@ -430,8 +430,8 @@
                 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':