Skip to content

Fix int types in _tkinter for Python 3.10 #951

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

Merged
jjhelmus merged 1 commit into from
Jan 15, 2026
Merged

Fix int types in _tkinter for Python 3.10 #951

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
1 change: 1 addition & 0 deletions cpython-unix/build-cpython.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@ fi
if [ "${PYTHON_MAJMIN_VERSION}" = "3.10" ]; then
# git checkout v3.10.19
# git cherry-pick 625887e6 27cbeb08 d4680b9e ec139c8f
# manually change int argc/objc -> Tcl_Size argc/objc in file
# git diff v3.10.19 Modules/_tkinter.c > patch-tkinter-backport-tcl-9-310.patch
patch -p1 -i ${ROOT}/patch-tkinter-backport-tcl-9-310.patch
fi
Expand Down
38 changes: 37 additions & 1 deletion cpython-unix/patch-tkinter-backport-tcl-9-310.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..8bed45f933d 100644
index 2a3e65b6c97..d601a2b7c2a 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -55,9 +55,24 @@ Copyright (C) 1994 Steen Lumholt.
Expand Down Expand Up @@ -44,6 +44,33 @@ index 2a3e65b6c97..8bed45f933d 100644
#if USE_TCL_UNICODE
int byteorder = NATIVE_BYTEORDER;
const Tcl_UniChar *u = Tcl_GetUnicodeFromObj(value, &len);
@@ -510,7 +526,7 @@ unicodeFromTclObj(Tcl_Obj *value)
static PyObject *
Split(const char *list)
{
- int argc;
+ Tcl_Size argc;
const char **argv;
PyObject *v;

@@ -612,7 +628,7 @@ SplitObj(PyObject *arg)
return result;
}
else if (PyUnicode_Check(arg)) {
- int argc;
+ Tcl_Size argc;
const char **argv;
const char *list = PyUnicode_AsUTF8(arg);

@@ -627,7 +643,7 @@ SplitObj(PyObject *arg)
/* Fall through, returning arg. */
}
else if (PyBytes_Check(arg)) {
- int argc;
+ Tcl_Size argc;
const char **argv;
const char *list = PyBytes_AS_STRING(arg);

@@ -655,6 +671,10 @@ class _tkinter.tktimertoken "TkttObject *" "&Tktt_Type_spec"

/**** Tkapp Object ****/
Expand Down Expand Up @@ -275,3 +302,12 @@ index 2a3e65b6c97..8bed45f933d 100644
Tcl_Obj **objv;
if (Tcl_ListObjGetElements(Tkapp_Interp(self),
((PyTclObject*)arg)->value,
@@ -2365,7 +2405,7 @@ _tkinter_tkapp_split(TkappObject *self, PyObject *arg)

if (PyTclObject_Check(arg)) {
Tcl_Obj *value = ((PyTclObject*)arg)->value;
- int objc;
+ Tcl_Size objc;
Tcl_Obj **objv;
int i;
if (Tcl_ListObjGetElements(Tkapp_Interp(self), value,
Loading