From: Brett Cannon <bcannon@gmail.com>
Date: Wed, 20 Sep 2006 18:43:13 +0000 (+0000)
Subject: Allow exceptions to be directly sliced again
X-Git-Tag: v2.6a1~2651
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f6aa86e33ba5b29ff9bd442e80e196746b5d2424;p=thirdparty%2FPython%2Fcpython.git

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 .
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 911f721f7898..c5cc2af3a993 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 2.6 alpha 1?
 Core and builtins
 -----------------
 
+- Allow exception instances to be directly sliced again.
+
 - Bug #1551432: Exceptions do not define an explicit __unicode__ method.  This
   allows calling unicode() on exceptions classes directly to succeed.
 
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index fda2ab1e301e..bfe28a95c0a8 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -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; */