commit 8cd1c7681d86fd3d32096f2d927d3f5014d58c36
author Mark Dickinson <mdickinson@enthought.com> Sun Nov 04 11:46:17 2012 +0000
committer Mark Dickinson <mdickinson@enthought.com> Sun Nov 04 11:46:17 2012 +0000
tree 52d64e583436f496e89b4c5dfdf0884e860cf3ba
parent b87f82f8d46c8cd0fd4ab60f9680ca51ad3345bc

Issue #16402: In range slicing, fix shadowing of exceptions from __index__ method.

Objects/rangeobject.c

diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c
index b67b969..cebccff 100644
--- a/Objects/rangeobject.c
+++ b/Objects/rangeobject.c
@@ -330,11 +330,11 @@
         if (PyIndex_Check(obj)) {
             result = PyNumber_Index(obj);
         }
-    }
-    if (result == NULL) {
-        PyErr_SetString(PyExc_TypeError,
-                        "slice indices must be integers or "
-                        "None or have an __index__ method");
+        else {
+            PyErr_SetString(PyExc_TypeError,
+                            "slice indices must be integers or "
+                            "None or have an __index__ method");
+        }
     }
     return result;
 }