summaryrefslogtreecommitdiffstats
path: root/Objects/rangeobject.c
diff options
context:
space:
mode:
authorMark Dickinson <mdickinson@enthought.com>2012-11-04 11:46:17 (GMT)
committerMark Dickinson <mdickinson@enthought.com>2012-11-04 11:46:17 (GMT)
commit8cd1c7681d86fd3d32096f2d927d3f5014d58c36 (patch)
tree52d64e583436f496e89b4c5dfdf0884e860cf3ba /Objects/rangeobject.c
parentb87f82f8d46c8cd0fd4ab60f9680ca51ad3345bc (diff)
downloadcpython-8cd1c7681d86fd3d32096f2d927d3f5014d58c36.zip
cpython-8cd1c7681d86fd3d32096f2d927d3f5014d58c36.tar.gz
cpython-8cd1c7681d86fd3d32096f2d927d3f5014d58c36.tar.bz2
Issue #16402: In range slicing, fix shadowing of exceptions from __index__ method.
Diffstat (limited to 'Objects/rangeobject.c')
-rw-r--r--Objects/rangeobject.c10
1 files changed, 5 insertions, 5 deletions
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 @@ compute_slice_element(PyObject *obj)
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;
}