From 9c4742e6ce2e1107ad07bc40695069e4c83a82c4 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 7 Mar 2010 00:00:37 +0000
Subject: [PATCH] more specific exception for wrong kind of raise #8082

---
 Python/ceval.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Python/ceval.c b/Python/ceval.c
index 7c1f7816e8e..1aa87a8d942 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3539,8 +3539,9 @@ do_raise(PyObject *type, PyObject *value, PyObject *tb)
 		/* Not something you can raise.  You get an exception
 		   anyway, just not what you specified :-) */
 		PyErr_Format(PyExc_TypeError,
-			"exceptions must be classes or instances, not %s",
-			type->ob_type->tp_name);
+			     "exceptions must be old-style classes or "
+			     "derived from BaseException, not %s",
+			     type->ob_type->tp_name);
 		goto raise_error;
 	}