From 036b3beca80cf2ccd6ffe98cf5d10eb8ee5e8b19 Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Mon, 26 Feb 2007 23:46:51 +0000
Subject: Fix SF bug #1669182.  Handle string exceptions even if unraisable (ie
 in __del__).

---
 Python/errors.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Python/errors.c')

diff --git a/Python/errors.c b/Python/errors.c
index f31f025112..bc77c3c1b7 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -590,7 +590,11 @@ PyErr_WriteUnraisable(PyObject *obj)
 		PyFile_WriteString("Exception ", f);
 		if (t) {
 			PyObject* moduleName;
-			char* className = PyExceptionClass_Name(t);
+			char* className = NULL;
+			if (PyExceptionClass_Check(t))
+				className = PyExceptionClass_Name(t);
+			else if (PyString_Check(t))
+				className = PyString_AS_STRING(t);
 
 			if (className != NULL) {
 				char *dot = strrchr(className, '.');
-- 
cgit v1.2.1