| commit | 07c6e7168919c275e47fa35c741413270d3d80fd | [log] [tgz] |
|---|---|---|
| author | Brett Cannon <brett@python.org> | Fri Aug 24 13:05:09 2012 -0400 |
| committer | Brett Cannon <brett@python.org> | Fri Aug 24 13:05:09 2012 -0400 |
| tree | 5dd658c5cf3b17902ddaf1c9dcc0c7d34dfeb6a6 | |
| parent | 491b1dc79efd4d3fc39b0ded2cd3fd746154b882 [diff] [blame] |
Issue #15778: Coerce ImportError.args to a string when it isn't already one. Patch by Dave Malcolm.
diff --git a/Objects/exceptions.c b/Objects/exceptions.c index b7e11f8..74bb262 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c
@@ -679,7 +679,7 @@ static PyObject * ImportError_str(PyImportErrorObject *self) { - if (self->msg) { + if (self->msg && PyUnicode_CheckExact(self->msg)) { Py_INCREF(self->msg); return self->msg; }