Issue #15778: Coerce ImportError.args to a string when it isn't
already one.
Patch by Dave Malcolm.
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 0b1fd1b..55e9db3 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -937,6 +937,11 @@
self.assertEqual(exc.name, 'somename')
self.assertEqual(exc.path, 'somepath')
+ def test_non_str_argument(self):
+ # Issue #15778
+ arg = b'abc'
+ exc = ImportError(arg)
+ self.assertEqual(str(arg), str(exc))
def test_main():
diff --git a/Misc/NEWS b/Misc/NEWS
index 57f022c..e772a70 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
Core and Builtins
-----------------
+- Issue #15778: ensure that str(ImportError(msg)) returns a str
+ even when msg isn't a str.
+
- Issue #2051: Source file permission bits are once again correctly
copied to the cached bytecode file. (The migration to importlib
reintroduced this problem because these was no regression test. A test
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;
}