[Python-checkins] cpython (merge 3.2 -> 3.3): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/37adcd9ffa1c
changeset:   90258:37adcd9ffa1c
branch:      3.3
parent:      90237:4f15bd1ab28f
parent:      90257:95d06fc2616b
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Apr 14 11:46:51 2014 -0400
summary:
  merge 3.2

files:
  Modules/_json.c |  9 +++++----
  1 files changed, 5 insertions(+), 4 deletions(-)


diff --git a/Modules/_json.c b/Modules/_json.c
--- 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;
     }

-- 
Repository URL: http://hg.python.org/cpython