Commit 8cd1c768 authored by Mark Dickinson's avatar Mark Dickinson

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

parent b87f82f8
...@@ -312,6 +312,15 @@ class RangeTest(unittest.TestCase): ...@@ -312,6 +312,15 @@ class RangeTest(unittest.TestCase):
self.assertRaises(TypeError, range, IN()) self.assertRaises(TypeError, range, IN())
# Test use of user-defined classes in slice indices.
self.assertEqual(list(range(10)[:I(5)]), list(range(5)))
with self.assertRaises(RuntimeError):
range(0, 10)[:IX()]
with self.assertRaises(TypeError):
range(0, 10)[:IN()]
def test_count(self): def test_count(self):
self.assertEqual(range(3).count(-1), 0) self.assertEqual(range(3).count(-1), 0)
self.assertEqual(range(3).count(0), 1) self.assertEqual(range(3).count(0), 1)
......
...@@ -10,6 +10,9 @@ What's New in Python 3.2.4 ...@@ -10,6 +10,9 @@ What's New in Python 3.2.4
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #16402: When slicing a range, fix shadowing of exceptions from
__index__.
- Issue #16336: fix input checking in the surrogatepass error handler. - Issue #16336: fix input checking in the surrogatepass error handler.
Patch by Serhiy Storchaka. Patch by Serhiy Storchaka.
......
...@@ -330,12 +330,12 @@ compute_slice_element(PyObject *obj) ...@@ -330,12 +330,12 @@ compute_slice_element(PyObject *obj)
if (PyIndex_Check(obj)) { if (PyIndex_Check(obj)) {
result = PyNumber_Index(obj); result = PyNumber_Index(obj);
} }
} else {
if (result == NULL) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"slice indices must be integers or " "slice indices must be integers or "
"None or have an __index__ method"); "None or have an __index__ method");
} }
}
return result; return result;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment