From 07c6e7168919c275e47fa35c741413270d3d80fd Mon Sep 17 00:00:00 2001
From: Brett Cannon <brett@python.org>
Date: Fri, 24 Aug 2012 13:05:09 -0400
Subject: Issue #15778: Coerce ImportError.args to a string when it isn't
 already one.

Patch by Dave Malcolm.
---
 Objects/exceptions.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Objects/exceptions.c')

diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index b7e11f85bf..74bb26285e 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -679,7 +679,7 @@ ImportError_traverse(PyImportErrorObject *self, visitproc visit, void *arg)
 static PyObject *
 ImportError_str(PyImportErrorObject *self)
 {
-    if (self->msg) {
+    if (self->msg && PyUnicode_CheckExact(self->msg)) {
         Py_INCREF(self->msg);
         return self->msg;
     }
-- 
cgit v1.2.1