Check if Tcl is threaded when creating a tkapp

Author: Michiel Jan Laurens de Hoon

Modules/_tkinter.c

@@ -43,7 +43,7 @@ Copyright (C) 1994 Steen Lumholt.
 /* As we require that Tcl is compiled for threads, we must also define
    TCL_THREADS. We define it always; if Tcl is not threaded, the thread
    functions in Tcl are empty. We check if Tcl is actually compiled for
-   threads when importing this module.  */
+   threads when creating a tkapp.  */
 #define TCL_THREADS
 
 #ifdef TK_FRAMEWORK
@@ -225,23 +225,6 @@ _get_tcl_lib_path(void)
 
 */
 
-#if TCL_MAJOR_VERSION < 9  /* Tcl 9.x is always threaded */
-static int
-_check_tcl_threaded(void)
-{
-    Tcl_Interp* interp;
-    Tcl_Obj* threaded;
-    interp = Tcl_CreateInterp();
-    threaded = Tcl_GetVar2Ex(interp,
-                             "tcl_platform",
-                             "threaded",
-                             TCL_GLOBAL_ONLY);
-    Tcl_DeleteInterp(interp);
-    if (threaded == NULL) return 0;
-    else return 1;
-}
-#endif
-
 static Tcl_ThreadDataKey state_key;
 typedef PyThreadState *ThreadSpecificData;
 #define tcl_tstate \
@@ -567,12 +550,29 @@ Tkapp_New(const char *screenName, const char *className,
 {
     TkappObject *v;
     char *argv0;
+#if TCL_MAJOR_VERSION < 9  /* Tcl 9.x is always threaded */
+    static Tcl_Obj* threaded = NULL;
+#endif
 
     v = PyObject_New(TkappObject, (PyTypeObject *) Tkapp_Type);
     if (v == NULL)
         return NULL;
 
     v->interp = Tcl_CreateInterp();
+#if TCL_MAJOR_VERSION < 9  /* Tcl 9.x is always threaded */
+    if (threaded == NULL) {
+        threaded = Tcl_GetVar2Ex(v->interp,
+                                 "tcl_platform",
+                                 "threaded",
+                                 TCL_GLOBAL_ONLY);
+        if (threaded == NULL) {
+            PyErr_SetString(PyExc_RuntimeError,
+                            "Tcl must be compiled with thread support");
+            Py_DECREF(v);
+            return NULL;
+        }
+    }
+#endif
     v->wantobjects = wantobjects;
     v->thread_id = Tcl_GetCurrentThread();
     v->dispatching = 0;
@@ -1426,10 +1426,9 @@ Tkapp_CallProc(Tcl_Event *evPtr, int flags)
 
 /* This is the main entry point for calling a Tcl command.
    It supports two cases, with regard to threading:
-   2. Caller of the command is in the interpreter thread:
-      Execute the command in the calling thread. Since the Tcl lock will
-      not be used, we can merge that with case 1.
-   3. Caller is in a different thread: Must queue an event to
+   1. Caller of the command is in the interpreter thread:
+      Execute the command in the calling thread.
+   2. Caller is in a different thread: Must queue an event to
       the interpreter thread. Allocation of Tcl objects needs to occur in the
       interpreter thread, so we ship the PyObject* args to the target thread,
       and perform processing there. */
@@ -3416,14 +3415,6 @@ PyInit__tkinter(void)
 {
     PyObject *m, *uexe, *cexe;
 
-#if TCL_MAJOR_VERSION < 9  /* Tcl 9.x is always threaded */
-    if (_check_tcl_threaded() == 0) {
-        PyErr_SetString(PyExc_ImportError,
-                        "Tcl must be compiled with thread support");
-        return 0;
-    }
-#endif
-
     m = PyModule_Create(&_tkintermodule);
     if (m == NULL)
         return NULL;