From 504153d55b11aa8f622b6e4baa6a5e94ddfe96e2 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Tue, 18 Mar 2008 04:26:48 +0000
Subject: Issue #2341: Add a Py3k warning when raising an exception that
 doesn't derive from BaseException.

---
 Python/ceval.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'Python')

diff --git a/Python/ceval.c b/Python/ceval.c
index d66d97e56b..dc1aa52eec 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3161,6 +3161,15 @@ do_raise(PyObject *type, PyObject *value, PyObject *tb)
 			     type->ob_type->tp_name);
 		goto raise_error;
 	}
+
+	assert(PyExceptionClass_Check(type));
+	if (Py_Py3kWarningFlag && PyClass_Check(type)) {
+		if (PyErr_Warn(PyExc_DeprecationWarning,
+			       "exceptions must derive from BaseException "
+			       "in 3.x") == -1)
+			goto raise_error;
+	}
+
 	PyErr_Restore(type, value, tb);
 	if (tb == NULL)
 		return WHY_EXCEPTION;
-- 
cgit v1.2.1