diff Objects/rangeobject.c @ 80236:94d15358ad6e 3.2

Issue #16402: In range slicing, fix shadowing of exceptions from __index__ method.
author Mark Dickinson <mdickinson@enthought.com>
date Sun, 04 Nov 2012 11:46:17 +0000
parents e4598364ea29
children 2b656a2cf7ef
line wrap: on
line diff
--- a/Objects/rangeobject.c	Sun Nov 04 06:59:22 2012 +0200
+++ b/Objects/rangeobject.c	Sun Nov 04 11:46:17 2012 +0000
@@ -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;
 }