Kaydet (Commit) f6aa86e3 authored tarafından Brett Cannon's avatar Brett Cannon

Allow exceptions to be directly sliced again

(e.g., ``BaseException(1,2,3)[0:2]``).

Discovered in Python 2.5.0 by Thomas Heller and reported to python-dev.  This
should be backported to 2.5 .
üst 9adeab7b
...@@ -12,6 +12,8 @@ What's New in Python 2.6 alpha 1? ...@@ -12,6 +12,8 @@ What's New in Python 2.6 alpha 1?
Core and builtins Core and builtins
----------------- -----------------
- Allow exception instances to be directly sliced again.
- Bug #1551432: Exceptions do not define an explicit __unicode__ method. This - Bug #1551432: Exceptions do not define an explicit __unicode__ method. This
allows calling unicode() on exceptions classes directly to succeed. allows calling unicode() on exceptions classes directly to succeed.
......
...@@ -190,12 +190,19 @@ BaseException_getitem(PyBaseExceptionObject *self, Py_ssize_t index) ...@@ -190,12 +190,19 @@ BaseException_getitem(PyBaseExceptionObject *self, Py_ssize_t index)
return PySequence_GetItem(self->args, index); return PySequence_GetItem(self->args, index);
} }
static PyObject *
BaseException_getslice(PyBaseExceptionObject *self,
Py_ssize_t start, Py_ssize_t stop)
{
return PySequence_GetSlice(self->args, start, stop);
}
static PySequenceMethods BaseException_as_sequence = { static PySequenceMethods BaseException_as_sequence = {
0, /* sq_length; */ 0, /* sq_length; */
0, /* sq_concat; */ 0, /* sq_concat; */
0, /* sq_repeat; */ 0, /* sq_repeat; */
(ssizeargfunc)BaseException_getitem, /* sq_item; */ (ssizeargfunc)BaseException_getitem, /* sq_item; */
0, /* sq_slice; */ (ssizessizeargfunc)BaseException_getslice, /* sq_slice; */
0, /* sq_ass_item; */ 0, /* sq_ass_item; */
0, /* sq_ass_slice; */ 0, /* sq_ass_slice; */
0, /* sq_contains; */ 0, /* sq_contains; */
......
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