merge 3.3

benjaminp · benjaminp · commit 7f7cd4a2bb7e · 2014-04-14T11:48:21.000-04:00
diff --git a/Modules/_json.c b/Modules/_json.c
@@ -941,10 +941,11 @@ scan_once_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssize_
     kind = PyUnicode_KIND(pystr);
     length = PyUnicode_GET_LENGTH(pystr);
 
-    if (idx < 0)
-        /* Compatibility with Python version. */
-        idx += length;
-    if (idx < 0 || idx >= length) {
+    if (idx < 0) {
+        PyErr_SetString(PyExc_ValueError, "idx cannot be negative");
+        return NULL;
+    }
+    if (idx >= length) {
         raise_stop_iteration(idx);
         return NULL;
     }
