Issue #16402: Merge fix from 3.3
This commit is contained in:
commit
c992fafddc
|
@ -312,6 +312,15 @@ class RangeTest(unittest.TestCase):
|
|||
|
||||
self.assertRaises(TypeError, range, IN())
|
||||
|
||||
# Test use of user-defined classes in slice indices.
|
||||
self.assertEqual(range(10)[:I(5)], range(5))
|
||||
|
||||
with self.assertRaises(RuntimeError):
|
||||
range(0, 10)[:IX()]
|
||||
|
||||
with self.assertRaises(TypeError):
|
||||
range(0, 10)[:IN()]
|
||||
|
||||
def test_count(self):
|
||||
self.assertEqual(range(3).count(-1), 0)
|
||||
self.assertEqual(range(3).count(0), 1)
|
||||
|
|
|
@ -10,6 +10,9 @@ What's New in Python 3.4.0 Alpha 1?
|
|||
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.
|
||||
Patch by Serhiy Storchaka.
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue