bpo-29999: repr() of ImportError now contains attributes name and path.

Author: serhiy-storchaka

Lib/test/test_exceptions.py

@@ -2595,6 +2595,36 @@ def after_with():
             with ExitFails():
                 1/0
         self.lineno_after_raise(after_with, 1, 1)
+    def test_repr(self):
+        exc = ImportError()
+        self.assertEqual(repr(exc), "ImportError()")
+
+        exc = ImportError('test')
+        self.assertEqual(repr(exc), "ImportError('test')")
+
+        exc = ImportError('test', 'case')
+        self.assertEqual(repr(exc), "ImportError('test', 'case')")
+
+        exc = ImportError(name='somemodule')
+        self.assertEqual(repr(exc), "ImportError(name='somemodule')")
+
+        exc = ImportError('test', name='somemodule')
+        self.assertEqual(repr(exc), "ImportError('test', name='somemodule')")
+
+        exc = ImportError(path='somepath')
+        self.assertEqual(repr(exc), "ImportError(path='somepath')")
+
+        exc = ImportError('test', path='somepath')
+        self.assertEqual(repr(exc), "ImportError('test', path='somepath')")
+
+        exc = ImportError(name='somename', path='somepath')
+        self.assertEqual(repr(exc),
+                "ImportError(name='somename', path='somepath')")
+
+        exc = ImportError('test', name='somename', path='somepath')
+        self.assertEqual(repr(exc),
+                "ImportError('test', name='somename', path='somepath')")
+
 
 if __name__ == '__main__':
     unittest.main()

Objects/exceptions.c

@@ -1864,6 +1864,30 @@ ImportError_reduce(PyObject *self, PyObject *Py_UNUSED(ignored))
     return res;
 }
 
+static PyObject *
+ImportError_repr(PyImportErrorObject *self)
+{
+    int hasargs = PyTuple_GET_SIZE(((PyBaseExceptionObject *)self)->args) != 0;
+    PyObject *r = BaseException_repr((PyBaseExceptionObject *)self);
+    if (r && (self->name || self->path)) {
+        /* remove ')' */
+        Py_SETREF(r, PyUnicode_Substring(r, 0, PyUnicode_GET_LENGTH(r) - 1));
+        if (r && self->name) {
+            Py_SETREF(r, PyUnicode_FromFormat("%U%sname=%R",
+                            r, hasargs ? ", " : "", self->name));
+            hasargs = 1;
+        }
+        if (r && self->path) {
+            Py_SETREF(r, PyUnicode_FromFormat("%U%spath=%R",
+                            r, hasargs ? ", " : "", self->path));
+        }
+        if (r) {
+            Py_SETREF(r, PyUnicode_FromFormat("%U)", r));
+        }
+    }
+    return r;
+}
+
 static PyMemberDef ImportError_members[] = {
     {"msg", _Py_T_OBJECT, offsetof(PyImportErrorObject, msg), 0,
         PyDoc_STR("exception message")},
@@ -1881,12 +1905,23 @@ static PyMethodDef ImportError_methods[] = {
     {NULL}
 };
 
-ComplexExtendsException(PyExc_Exception, ImportError,
-                        ImportError, 0 /* new */,
-                        ImportError_methods, ImportError_members,
-                        0 /* getset */, ImportError_str,
-                        "Import can't find module, or can't find name in "
-                        "module.");
+static PyTypeObject _PyExc_ImportError = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    "ImportError",
+    sizeof(PyImportErrorObject), 0,
+    (destructor)ImportError_dealloc, 0, 0, 0, 0,
+    (reprfunc)ImportError_repr, 0, 0, 0, 0, 0,
+    (reprfunc)ImportError_str, 0, 0, 0,
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC,
+    PyDoc_STR("Import can't find module, or can't find name in "
+              "module."),
+    (traverseproc)ImportError_traverse,
+    (inquiry)ImportError_clear, 0, 0, 0, 0, ImportError_methods,
+    ImportError_members, 0, &_PyExc_Exception,
+    0, 0, 0, offsetof(PyImportErrorObject, dict),
+    (initproc)ImportError_init,
+};
+PyObject *PyExc_ImportError = (PyObject *)&_PyExc_ImportError;
 
 /*
  *    ModuleNotFoundError extends ImportError