mirror of https://github.com/python/cpython
Backport of fix to allow exception instances to be sliced once again.
This commit is contained in:
parent
7dcdeaf1f7
commit
c70e003f75
|
@ -279,6 +279,13 @@ class ExceptionTests(unittest.TestCase):
|
|||
'pickled "%r", attribute "%s' %
|
||||
(e, checkArgName))
|
||||
|
||||
def testSlicing(self):
|
||||
# Test that you can slice an exception directly instead of requiring
|
||||
# going through the 'args' attribute.
|
||||
args = (1, 2, 3)
|
||||
exc = BaseException(*args)
|
||||
self.failUnlessEqual(exc[:], args)
|
||||
|
||||
def testKeywordArgs(self):
|
||||
# test that builtin exception don't take keyword args,
|
||||
# but user-defined subclasses can if they want
|
||||
|
|
11
Misc/NEWS
11
Misc/NEWS
|
@ -4,6 +4,17 @@ Python News
|
|||
|
||||
(editors: check NEWS.help for information about editing NEWS using ReST.)
|
||||
|
||||
What's New in Python 2.5.1c1?
|
||||
=============================
|
||||
|
||||
*Release date: XX-XXX-XXXX*
|
||||
|
||||
Core and builtins
|
||||
-----------------
|
||||
|
||||
- Allow exception instances to be directly sliced again.
|
||||
|
||||
|
||||
What's New in Python 2.5 (final)
|
||||
================================
|
||||
|
||||
|
|
|
@ -190,12 +190,19 @@ BaseException_getitem(PyBaseExceptionObject *self, Py_ssize_t 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 = {
|
||||
0, /* sq_length; */
|
||||
0, /* sq_concat; */
|
||||
0, /* sq_repeat; */
|
||||
(ssizeargfunc)BaseException_getitem, /* sq_item; */
|
||||
0, /* sq_slice; */
|
||||
(ssizessizeargfunc)BaseException_getslice, /* sq_slice; */
|
||||
0, /* sq_ass_item; */
|
||||
0, /* sq_ass_slice; */
|
||||
0, /* sq_contains; */
|
||||
|
|
Loading…
Reference in New Issue