Skip to content

fix: propagate Tcl library path across Tk-created interpreters #958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
shaanmajid wants to merge 1 commit into
base: main
Choose a base branch
from
+239 −109
Draft

fix: propagate Tcl library path across Tk-created interpreters #958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 46 additions & 20 deletions cpython-unix/patch-tkinter-3.10.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 2a3e65b6c97..04f2ab0ea10 100644
index 2a3e65b..2572277 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -115,6 +115,7 @@ Copyright (C) 1994 Steen Lumholt.
Expand All @@ -18,17 +18,20 @@ index 2a3e65b6c97..04f2ab0ea10 100644
/* Check expected location for an installed Python first */
tcl_library_path = PyUnicode_FromString("\\tcl\\tcl" TCL_VERSION);
if (tcl_library_path == NULL) {
@@ -169,11 +171,31 @@ _get_tcl_lib_path()
@@ -169,11 +171,34 @@ _get_tcl_lib_path()
tcl_library_path = NULL;
#endif
}
+#else
+ /* Check expected location for an installed Python first */
+ tcl_library_path = PyUnicode_FromString("/lib/tcl" TCL_VERSION);
+ if (tcl_library_path == NULL) {
+ PyObject *suffix = PyUnicode_FromString("/lib/tcl" TCL_VERSION);
+ if (suffix == NULL) {
+ Py_DECREF(prefix);
+ return NULL;
+ }
+ tcl_library_path = PyUnicode_Concat(prefix, tcl_library_path);
+ tcl_library_path = PyUnicode_Concat(prefix, suffix);
+ Py_DECREF(suffix);
+ Py_DECREF(prefix);
+ if (tcl_library_path == NULL) {
+ return NULL;
+ }
Expand All @@ -51,10 +54,27 @@ index 2a3e65b6c97..04f2ab0ea10 100644

/* The threading situation is complicated. Tcl is not thread-safe, except
when configured with --enable-threads.
@@ -822,6 +844,30 @@ Tkapp_New(const char *screenName, const char *className,
@@ -709,6 +731,9 @@ Tkapp_New(const char *screenName, const char *className,
{
TkappObject *v;
char *argv0;
+#ifndef MS_WINDOWS
+ int tcl_library_env_set = 0;
+#endif

ret = GetEnvironmentVariableW(L"TCL_LIBRARY", NULL, 0);
if (!ret && GetLastError() == ERROR_ENVVAR_NOT_FOUND) {
v = PyObject_New(TkappObject, (PyTypeObject *) Tkapp_Type);
if (v == NULL)
@@ -839,9 +864,41 @@ Tkapp_New(const char *screenName, const char *className,
}
}
}
+#else
+ {
+ const char *env_val = getenv("TCL_LIBRARY");
+ if (!env_val || !env_val[0]) {
+ PyObject *str_path;
+ PyObject *utf8_path;
+
+ str_path = _get_tcl_lib_path();
+ if (str_path == NULL && PyErr_Occurred()) {
+ return NULL;
Expand All @@ -68,29 +88,35 @@ index 2a3e65b6c97..04f2ab0ea10 100644
+ "tcl_library",
+ PyBytes_AS_STRING(utf8_path),
+ TCL_GLOBAL_ONLY);
+ setenv("TCL_LIBRARY", PyBytes_AS_STRING(utf8_path), 1);
+ tcl_library_env_set = 1;
+ Py_DECREF(utf8_path);
+ }
+ }
+ }
+#else
+ {
+ const char *env_val = getenv("TCL_LIBRARY");
+ if (!env_val) {
+ PyObject *str_path;
+ PyObject *utf8_path;
+
str_path = _get_tcl_lib_path();
if (str_path == NULL && PyErr_Occurred()) {
return NULL;
@@ -3628,7 +3674,32 @@ PyInit__tkinter(void)
#endif

- if (Tcl_AppInit(v->interp) != TCL_OK) {
+ int app_rc = Tcl_AppInit(v->interp);
+#ifndef MS_WINDOWS
+ if (tcl_library_env_set) {
+ unsetenv("TCL_LIBRARY");
+ }
+#endif
+ if (app_rc != TCL_OK) {
PyObject *result = Tkinter_Error(v);
#ifdef TKINTER_PROTECT_LOADTK
if (wantTk) {
@@ -3628,7 +3685,33 @@ PyInit__tkinter(void)
PyMem_Free(wcs_path);
}
#else
+ int set_var = 0;
+ PyObject *str_path;
+ char *path;
+ const char *env_val = getenv("TCL_LIBRARY");
+
+ if (!getenv("TCL_LIBRARY")) {
+ if (!env_val || !env_val[0]) {
+ str_path = _get_tcl_lib_path();
+ if (str_path == NULL && PyErr_Occurred()) {
+ Py_DECREF(m);
Expand Down
66 changes: 46 additions & 20 deletions cpython-unix/patch-tkinter-3.11.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 005036d3ff2..0e64706584a 100644
index 005036d..1dd202d 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -28,9 +28,7 @@ Copyright (C) 1994 Steen Lumholt.
Expand Down Expand Up @@ -29,17 +29,20 @@ index 005036d3ff2..0e64706584a 100644
/* Check expected location for an installed Python first */
tcl_library_path = PyUnicode_FromString("\\tcl\\tcl" TCL_VERSION);
if (tcl_library_path == NULL) {
@@ -177,11 +177,31 @@ _get_tcl_lib_path()
@@ -177,11 +177,34 @@ _get_tcl_lib_path()
tcl_library_path = NULL;
#endif
}
+#else
+ /* Check expected location for an installed Python first */
+ tcl_library_path = PyUnicode_FromString("/lib/tcl" TCL_VERSION);
+ if (tcl_library_path == NULL) {
+ PyObject *suffix = PyUnicode_FromString("/lib/tcl" TCL_VERSION);
+ if (suffix == NULL) {
+ Py_DECREF(prefix);
+ return NULL;
+ }
+ tcl_library_path = PyUnicode_Concat(prefix, tcl_library_path);
+ tcl_library_path = PyUnicode_Concat(prefix, suffix);
+ Py_DECREF(suffix);
+ Py_DECREF(prefix);
+ if (tcl_library_path == NULL) {
+ return NULL;
+ }
Expand All @@ -62,10 +65,27 @@ index 005036d3ff2..0e64706584a 100644

/* The threading situation is complicated. Tcl is not thread-safe, except
when configured with --enable-threads.
@@ -687,6 +707,30 @@ Tkapp_New(const char *screenName, const char *className,
@@ -574,6 +594,9 @@ Tkapp_New(const char *screenName, const char *className,
{
TkappObject *v;
char *argv0;
+#ifndef MS_WINDOWS
+ int tcl_library_env_set = 0;
+#endif

ret = GetEnvironmentVariableW(L"TCL_LIBRARY", NULL, 0);
if (!ret && GetLastError() == ERROR_ENVVAR_NOT_FOUND) {
v = PyObject_New(TkappObject, (PyTypeObject *) Tkapp_Type);
if (v == NULL)
@@ -704,9 +727,41 @@ Tkapp_New(const char *screenName, const char *className,
}
}
}
+#else
+ {
+ const char *env_val = getenv("TCL_LIBRARY");
+ if (!env_val || !env_val[0]) {
+ PyObject *str_path;
+ PyObject *utf8_path;
+
+ str_path = _get_tcl_lib_path();
+ if (str_path == NULL && PyErr_Occurred()) {
+ return NULL;
Expand All @@ -79,29 +99,35 @@ index 005036d3ff2..0e64706584a 100644
+ "tcl_library",
+ PyBytes_AS_STRING(utf8_path),
+ TCL_GLOBAL_ONLY);
+ setenv("TCL_LIBRARY", PyBytes_AS_STRING(utf8_path), 1);
+ tcl_library_env_set = 1;
+ Py_DECREF(utf8_path);
+ }
+ }
+ }
+#else
+ {
+ const char *env_val = getenv("TCL_LIBRARY");
+ if (!env_val) {
+ PyObject *str_path;
+ PyObject *utf8_path;
+
str_path = _get_tcl_lib_path();
if (str_path == NULL && PyErr_Occurred()) {
return NULL;
@@ -3428,7 +3472,32 @@ PyInit__tkinter(void)
#endif

- if (Tcl_AppInit(v->interp) != TCL_OK) {
+ int app_rc = Tcl_AppInit(v->interp);
+#ifndef MS_WINDOWS
+ if (tcl_library_env_set) {
+ unsetenv("TCL_LIBRARY");
+ }
+#endif
+ if (app_rc != TCL_OK) {
PyObject *result = Tkinter_Error(v);
#ifdef TKINTER_PROTECT_LOADTK
if (wantTk) {
@@ -3428,7 +3483,33 @@ PyInit__tkinter(void)
PyMem_Free(wcs_path);
}
#else
+ int set_var = 0;
+ PyObject *str_path;
+ char *path;
+ const char *env_val = getenv("TCL_LIBRARY");
+
+ if (!getenv("TCL_LIBRARY")) {
+ if (!env_val || !env_val[0]) {
+ str_path = _get_tcl_lib_path();
+ if (str_path == NULL && PyErr_Occurred()) {
+ Py_DECREF(m);
Expand Down
72 changes: 49 additions & 23 deletions cpython-unix/patch-tkinter-3.12.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 6b5fcb8a365..7b196f40166 100644
index 60f66a5..dcd10a6 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -28,9 +28,7 @@ Copyright (C) 1994 Steen Lumholt.
Expand All @@ -12,34 +12,37 @@ index 6b5fcb8a365..7b196f40166 100644
+#include "pycore_fileutils.h" // _Py_stat()

#include "pycore_long.h"

@@ -134,6 +132,7 @@ typedef int Tcl_Size;
#include "pycore_sysmodule.h" // _PySys_GetOptionalAttrString()
@@ -135,6 +133,7 @@ typedef int Tcl_Size;
#ifdef MS_WINDOWS
#include <conio.h>
#define WAIT_FOR_STDIN
+#endif

static PyObject *
_get_tcl_lib_path(void)
@@ -151,6 +150,7 @@ _get_tcl_lib_path(void)
@@ -152,6 +151,7 @@ _get_tcl_lib_path(void)
return NULL;
}

+#ifdef MS_WINDOWS
/* Check expected location for an installed Python first */
tcl_library_path = PyUnicode_FromString("\\tcl\\tcl" TCL_VERSION);
if (tcl_library_path == NULL) {
@@ -188,11 +188,31 @@ _get_tcl_lib_path(void)
@@ -191,11 +191,34 @@ _get_tcl_lib_path(void)
tcl_library_path = NULL;
#endif
}
+#else
+ /* Check expected location for an installed Python first */
+ tcl_library_path = PyUnicode_FromString("/lib/tcl" TCL_VERSION);
+ if (tcl_library_path == NULL) {
+ PyObject *suffix = PyUnicode_FromString("/lib/tcl" TCL_VERSION);
+ if (suffix == NULL) {
+ Py_DECREF(prefix);
+ return NULL;
+ }
+ tcl_library_path = PyUnicode_Concat(prefix, tcl_library_path);
+ tcl_library_path = PyUnicode_Concat(prefix, suffix);
+ Py_DECREF(suffix);
+ Py_DECREF(prefix);
+ if (tcl_library_path == NULL) {
+ return NULL;
+ }
Expand All @@ -62,10 +65,27 @@ index 6b5fcb8a365..7b196f40166 100644

/* The threading situation is complicated. Tcl is not thread-safe, except
when configured with --enable-threads.
@@ -713,6 +733,30 @@ Tkapp_New(const char *screenName, const char *className,
@@ -582,6 +602,9 @@ Tkapp_New(const char *screenName, const char *className,
{
TkappObject *v;
char *argv0;
+#ifndef MS_WINDOWS
+ int tcl_library_env_set = 0;
+#endif

ret = GetEnvironmentVariableW(L"TCL_LIBRARY", NULL, 0);
if (!ret && GetLastError() == ERROR_ENVVAR_NOT_FOUND) {
v = PyObject_New(TkappObject, (PyTypeObject *) Tkapp_Type);
if (v == NULL)
@@ -733,9 +756,41 @@ Tkapp_New(const char *screenName, const char *className,
}
}
}
+#else
+ {
+ const char *env_val = getenv("TCL_LIBRARY");
+ if (!env_val || !env_val[0]) {
+ PyObject *str_path;
+ PyObject *utf8_path;
+
+ str_path = _get_tcl_lib_path();
+ if (str_path == NULL && PyErr_Occurred()) {
+ return NULL;
Expand All @@ -79,29 +99,35 @@ index 6b5fcb8a365..7b196f40166 100644
+ "tcl_library",
+ PyBytes_AS_STRING(utf8_path),
+ TCL_GLOBAL_ONLY);
+ setenv("TCL_LIBRARY", PyBytes_AS_STRING(utf8_path), 1);
+ tcl_library_env_set = 1;
+ Py_DECREF(utf8_path);
+ }
+ }
+ }
+#else
+ {
+ const char *env_val = getenv("TCL_LIBRARY");
+ if (!env_val) {
+ PyObject *str_path;
+ PyObject *utf8_path;
+
str_path = _get_tcl_lib_path();
if (str_path == NULL && PyErr_Occurred()) {
return NULL;
@@ -3542,7 +3586,32 @@ PyInit__tkinter(void)
#endif

- if (Tcl_AppInit(v->interp) != TCL_OK) {
+ int app_rc = Tcl_AppInit(v->interp);
+#ifndef MS_WINDOWS
+ if (tcl_library_env_set) {
+ unsetenv("TCL_LIBRARY");
+ }
+#endif
+ if (app_rc != TCL_OK) {
PyObject *result = Tkinter_Error(v);
Py_DECREF((PyObject *)v);
return (TkappObject *)result;
@@ -3548,7 +3603,33 @@ PyInit__tkinter(void)
PyMem_Free(wcs_path);
}
#else
+ int set_var = 0;
+ PyObject *str_path;
+ char *path;
+ const char *env_val = getenv("TCL_LIBRARY");
+
+ if (!getenv("TCL_LIBRARY")) {
+ if (!env_val || !env_val[0]) {
+ str_path = _get_tcl_lib_path();
+ if (str_path == NULL && PyErr_Occurred()) {
+ Py_DECREF(m);
Expand Down
Loading