gh-103538: Remove unused TK_AQUA code (GH-103539)

python · May 10, 2023 · e464ec9 · e464ec9
1 parent a33ce66
commit e464ec9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 64 deletions.
diff --git a/Misc/NEWS.d/next/Library/2023-04-14-21-12-32.gh-issue-103538.M4FK_v.rst b/Misc/NEWS.d/next/Library/2023-04-14-21-12-32.gh-issue-103538.M4FK_v.rst
@@ -0,0 +1,3 @@
+Remove ``_tkinter`` module code guarded by definition of the ``TK_AQUA`` macro
+which was only needed for Tk 8.4.7 or earlier and was never actually defined by
+any build system or documented for manual use.
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
@@ -3283,20 +3283,6 @@ PyInit__tkinter(void)
     }
     PyTclObject_Type = o;
 
-#ifdef TK_AQUA
-    /* Tk_MacOSXSetupTkNotifier must be called before Tcl's subsystems
-     * start waking up.  Note that Tcl_FindExecutable will do this, this
-     * code must be above it! The original warning from
-     * tkMacOSXAppInit.c is copied below.
-     *
-     * NB - You have to swap in the Tk Notifier BEFORE you start up the
-     * Tcl interpreter for now.  It probably should work to do this
-     * in the other order, but for now it doesn't seem to.
-     *
-     */
-    Tk_MacOSXSetupTkNotifier();
-#endif
-
 
     /* This helps the dynamic loader; in Unicode aware Tcl versions
        it also helps Tcl find its encodings. */

diff --git a/Modules/tkappinit.c b/Modules/tkappinit.c
@@ -23,54 +23,9 @@ Tcl_AppInit(Tcl_Interp *interp)
 {
     const char *_tkinter_skip_tk_init;
 
-#ifdef TK_AQUA
-#ifndef MAX_PATH_LEN
-#define MAX_PATH_LEN 1024
-#endif
-    char tclLibPath[MAX_PATH_LEN], tkLibPath[MAX_PATH_LEN];
-    Tcl_Obj*            pathPtr;
-
-    /* pre- Tcl_Init code copied from tkMacOSXAppInit.c */
-    Tk_MacOSXOpenBundleResources (interp, "com.tcltk.tcllibrary",
-    tclLibPath, MAX_PATH_LEN, 0);
-
-    if (tclLibPath[0] != '\0') {
-    Tcl_SetVar(interp, "tcl_library", tclLibPath, TCL_GLOBAL_ONLY);
-        Tcl_SetVar(interp, "tclDefaultLibrary", tclLibPath, TCL_GLOBAL_ONLY);
-        Tcl_SetVar(interp, "tcl_pkgPath", tclLibPath, TCL_GLOBAL_ONLY);
-    }
-
-    if (tclLibPath[0] != '\0') {
-        Tcl_SetVar(interp, "tcl_library", tclLibPath, TCL_GLOBAL_ONLY);
-        Tcl_SetVar(interp, "tclDefaultLibrary", tclLibPath, TCL_GLOBAL_ONLY);
-        Tcl_SetVar(interp, "tcl_pkgPath", tclLibPath, TCL_GLOBAL_ONLY);
-    }
-#endif
     if (Tcl_Init (interp) == TCL_ERROR)
         return TCL_ERROR;
 
-#ifdef TK_AQUA
-    /* pre- Tk_Init code copied from tkMacOSXAppInit.c */
-    Tk_MacOSXOpenBundleResources (interp, "com.tcltk.tklibrary",
-        tkLibPath, MAX_PATH_LEN, 1);
-
-    if (tclLibPath[0] != '\0') {
-        pathPtr = Tcl_NewStringObj(tclLibPath, -1);
-    } else {
-        Tcl_Obj *pathPtr = TclGetLibraryPath();
-    }
-
-    if (tkLibPath[0] != '\0') {
-        Tcl_Obj *objPtr;
-
-        Tcl_SetVar(interp, "tk_library", tkLibPath, TCL_GLOBAL_ONLY);
-        objPtr = Tcl_NewStringObj(tkLibPath, -1);
-        Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-    }
-
-    TclSetLibraryPath(pathPtr);
-#endif
-
 #ifdef WITH_XXX
         /* Initialize modules that don't require Tk */
 #endif
@@ -88,11 +43,6 @@ Tcl_AppInit(Tcl_Interp *interp)
 
     Tk_MainWindow(interp);
 
-#ifdef TK_AQUA
-    TkMacOSXInitAppleEvents(interp);
-    TkMacOSXInitMenus(interp);
-#endif
-
 #ifdef WITH_PIL /* 0.2b5 and later -- not yet released as of May 14 */
     {
         extern void TkImaging_Init(Tcl_Interp *);