- Issue 2379: Raise a Py3K warning for __getitem__ or __getslice__ on

gvanrossum · gvanrossum · commit 6d91be37586b · 2008-03-18T04:42:22.000Z
exception instances.
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 2.6 alpha 2?
 Core and builtins
 -----------------
 
+- Issue 2379: Raise a Py3K warning for __getitem__ or __getslice__ on
+  exception instances.
+
 - Issue #2371: Add a Py3k warning when catching an exception that
   doesn't derive from BaseException.  Issue #2341: Add a Py3k warning
   when raising an exception that doesn't derive from BaseException.
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
@@ -189,13 +189,25 @@ static PyMethodDef BaseException_methods[] = {
 static PyObject *
 BaseException_getitem(PyBaseExceptionObject *self, Py_ssize_t index)
 {
+    if (Py_Py3kWarningFlag) {
+	if (PyErr_Warn(PyExc_DeprecationWarning,
+		       "In 3.x, __getitem__ is not supported for exception "
+		       "classes, use args attribute") == -1)
+	    return NULL;
+    }
     return PySequence_GetItem(self->args, index);
 }
 
 static PyObject *
 BaseException_getslice(PyBaseExceptionObject *self,
 			Py_ssize_t start, Py_ssize_t stop)
 {
+    if (Py_Py3kWarningFlag) {
+	if (PyErr_Warn(PyExc_DeprecationWarning,
+		       "In 3.x, __getslice__ is not supported for exception "
+		       "classes, use args attribute") == -1)
+	    return NULL;
+    }
     return PySequence_GetSlice(self->args, start, stop);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -189,13 +189,25 @@ static PyMethodDef BaseException_methods[] = {`
`189`	`189`	`static PyObject *`
`190`	`190`	`BaseException_getitem(PyBaseExceptionObject *self, Py_ssize_t index)`
`191`	`191`	`{`
	`192`	`+ if (Py_Py3kWarningFlag) {`
	`193`	`+ if (PyErr_Warn(PyExc_DeprecationWarning,`
	`194`	`+ "In 3.x, __getitem__ is not supported for exception "`
	`195`	`+ "classes, use args attribute") == -1)`
	`196`	`+ return NULL;`
	`197`	`+ }`
`192`	`198`	`return PySequence_GetItem(self->args, index);`
`193`	`199`	`}`
`194`	`200`
`195`	`201`	`static PyObject *`
`196`	`202`	`BaseException_getslice(PyBaseExceptionObject *self,`
`197`	`203`	`Py_ssize_t start, Py_ssize_t stop)`
`198`	`204`	`{`
	`205`	`+ if (Py_Py3kWarningFlag) {`
	`206`	`+ if (PyErr_Warn(PyExc_DeprecationWarning,`
	`207`	`+ "In 3.x, __getslice__ is not supported for exception "`
	`208`	`+ "classes, use args attribute") == -1)`
	`209`	`+ return NULL;`
	`210`	`+ }`
`199`	`211`	`return PySequence_GetSlice(self->args, start, stop);`
`200`	`212`	`}`
`201`	`213`