Issue #16402: Merge fix from 3.2

This commit is contained in:
Mark Dickinson 2012-11-04 11:47:05 +00:00
commit 1321edaa55
3 changed files with 17 additions and 5 deletions

View file

@ -331,11 +331,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;
}