commit 9beee049b0ff72d684e342a5b77bba4fba2df59b
author Benjamin Peterson <benjamin@python.org> Mon Apr 14 11:46:51 2014 -0400
committer Benjamin Peterson <benjamin@python.org> Mon Apr 14 11:46:51 2014 -0400
tree 3ca5a7e0d0eb5d6729abc76b01f0d2ad62ed3a57
parent 156285c35f8ff856883f09394653b000331e3e33
parent 6ef2b36afa5bf694e343f7227c7fa17fc231121a

merge 3.2

Modules/_json.c

diff --git a/Modules/_json.c b/Modules/_json.c
index ec980c9..4bc585d 100644
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -975,10 +975,11 @@
     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) {
         PyErr_SetNone(PyExc_StopIteration);
         return NULL;
     }