Normalize tk load failures to ImportErrors.

anntzer · anntzer · commit 9cce264020e5 · 2022-05-21T18:44:25.000+02:00
Wrapping the internally raised exception should make it easier
to debug any failures.  Test e.g. by replacing `__file__` by
`_file_` in the same source file and recompiling to trigger an
AttributeError-that-gets-wrapped-by-ImportError.
diff --git a/src/_tkagg.cpp b/src/_tkagg.cpp
@@ -341,16 +341,22 @@ static PyModuleDef _tkagg_module = {
 PyMODINIT_FUNC PyInit__tkagg(void)
 {
     load_tkinter_funcs();
-    if (PyErr_Occurred()) {
+    PyObject *type, *value, *traceback;
+    PyErr_Fetch(&type, &value, &traceback);
+    // Always raise ImportError (normalizing a previously set exception if
+    // needed) to interact properly with backend auto-fallback.
+    if (value) {
+        PyErr_NormalizeException(&type, &value, &traceback);
+        PyErr_SetObject(PyExc_ImportError, value);
         return NULL;
     } else if (!TCL_SETVAR) {
-        PyErr_SetString(PyExc_RuntimeError, "Failed to load Tcl_SetVar");
+        PyErr_SetString(PyExc_ImportError, "Failed to load Tcl_SetVar");
         return NULL;
     } else if (!TK_FIND_PHOTO) {
-        PyErr_SetString(PyExc_RuntimeError, "Failed to load Tk_FindPhoto");
+        PyErr_SetString(PyExc_ImportError, "Failed to load Tk_FindPhoto");
         return NULL;
     } else if (!TK_PHOTO_PUT_BLOCK) {
-        PyErr_SetString(PyExc_RuntimeError, "Failed to load Tk_PhotoPutBlock");
+        PyErr_SetString(PyExc_ImportError, "Failed to load Tk_PhotoPutBlock");
         return NULL;
     }
     return PyModule_Create(&_tkagg_module);
