10000 gh-103194: Fix Tkinter’s Tcl value type handling for Tcl 8.7/9.0 by chrstphrchvz · Pull Request #103846 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-103194: Fix Tkinter’s Tcl value type handling for Tcl 8.7/9.0 #103846

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
merged 21 commits into from
May 31, 2024
Merged

gh-103194: Fix Tkinter’s Tcl value type handling for Tcl 8.7/9.0 #103846

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e3e8444
gh-103194: Fix value type handling for Tcl 8.7/9.0
chrstphrchvz Apr 16, 2023
df7c1b8
Try to recognize Tcl 8.7 utf32string
chrstphrchvz Apr 22, 2023
804d0fd
"utf32string" is now registered
chrstphrchvz Apr 22, 2023
3c3393c
Add blurb
chrstphrchvz Apr 24, 2023
1db1da8
Further refinements, cleanup
chrstphrchvz Apr 25, 2023
2440b44
Merge branch 'main' into patch-103194
AlexWaygood Apr 25, 2023
b1f5e0e
Merge branch 'main' into patch-103194
chrstphrchvz May 2, 2023
f518df7
Merge branch 'main' into patch-103194
chrstphrchvz May 11, 2023
acdd7fa
Merge branch 'main' into patch-103194
chrstphrchvz May 24, 2023
c69ae99
Merge branch 'main' into patch-103194
chrstphrchvz Jun 26, 2023
7d63d0e
Conform to PEP 7 for added brace
chrstphrchvz Jul 3, 2023
f935d2d
Merge branch 'main' into patch-103194
chrstphrchvz Jul 23, 2023
4aeed09
Merge branch 'main' into patch-103194
chrstphrchvz Jul 26, 2023
55e68d9
Merge branch 'main' into patch-103194
chrstphrchvz Jul 29, 2023
0ddab95
Merge branch 'main' into patch-103194
chrstphrchvz Aug 20, 2023
73b32e4
Merge branch 'main' into patch-103194
chrstphrchvz Aug 30, 2023
2424115
Merge branch 'main' into patch-103194
chrstphrchvz Sep 23, 2023
0a6e69f
Merge branch 'main' into patch-103194
chrstphrchvz Oct 18, 2023
f57cc48
Merge branch 'python:main' into patch-103194
chrstphrchvz Oct 25, 2023
a3c625b
Merge branch 'main' into patch-103194
chrstphrchvz Dec 3, 2023
911d793
Merge branch 'main' into patch-103194
8000 serhiy-storchaka May 31, 2024
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
Next Next commit
gh-103194: Fix value type handling for Tcl 8.7/9.0
  • Loading branch information
@chrstphrchvz
chrstphrchvz committed Apr 25, 2023
commit e3e844472178eb68ac69261f90bc4ef1623d4809
59 changes: 40 additions & 19 deletions Modules/_tkinter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,11 +581,44 @@ Tkapp_New(const char *screenName, const char *className,
}

v->OldBooleanType = Tcl_GetObjType("boolean");
v->BooleanType = Tcl_GetObjType("booleanString");
v->ByteArrayType = Tcl_GetObjType("bytearray");
{
Tcl_Obj *value;
int boolValue;

/* Tcl 8.5 booleanString type is not registered
and is renamed to boolean in Tcl 9.0.
Based on approach suggested at
https://core.tcl-lang.org/tcl/info/3bb3bcf2da5b */
value = Tcl_NewStringObj("true", -1);
Tcl_GetBooleanFromObj(NULL, value, &boolValue);
//fprintf(stderr, "%s %p\n", value->typePtr->name, value->typePtr);
v->BooleanType = value->typePtr;
Tcl_DecrRefCount(value);

// As suggested by TIP 484
value = Tcl_NewIntObj(0);
//fprintf(stderr, "%s %p\n", value->typePtr->name, value->typePtr);
v->IntType = value->typePtr;
Tcl_DecrRefCount(value);

/* Retrieve the 64-bit type, which is either "wideInt" or "int";
the "wideInt" type is only available when the "int" type is 32-bit. */
value = Tcl_NewWideIntObj(
/* Must use a value wider than 32-bit here, otherwise
Tcl_NewWideIntObj() could return a 32-bit "int". */
(Tcl_WideInt)(1) << 32
);
//fprintf(stderr, "%s %p\n", value->typePtr->name, value->typePtr);
v->WideIntType = value->typePtr;
Tcl_DecrRefCount(value);

// bytearray type is not registered in Tcl 9.0
value = Tcl_NewByteArrayObj(NULL, 0);
//fprintf(stderr, "%s %p\n", value->typePtr->name, value->typePtr);
v->ByteArrayType = value->typePtr;
Tcl_DecrRefCount(value);
}
v->DoubleType = Tcl_GetObjType("double");
v->IntType = Tcl_GetObjType("int");
v->WideIntType = Tcl_GetObjType("wideInt");
v->BignumType = Tcl_GetObjType("bignum");
v->ListType = Tcl_GetObjType("list");
v->ProcBodyType = Tcl_GetObjType("procbody");
Expand Down Expand Up @@ -1092,10 +1125,12 @@ FromObj(TkappObject *tkapp, Tcl_Obj *value)

if (value->typePtr == tkapp->BooleanType ||
value->typePtr == tkapp->OldBooleanType) {
//fprintf(stderr, "fromBoolean\n");
return fromBoolean(tkapp, value);
}

if (value->typePtr == tkapp->ByteArrayType) {
//fprintf(stderr, "got bytearray\n");
int size;
char *data = (char*)Tcl_GetByteArrayFromObj(value, &size);
return PyBytes_FromStringAndSize(data, size);
Expand All @@ -1105,16 +1140,9 @@ FromObj(TkappObject *tkapp, Tcl_Obj *value)
return PyFloat_FromDouble(value->internalRep.doubleValue);
}

if (value->typePtr == tkapp->IntType) {
long longValue;
if (Tcl_GetLongFromObj(interp, value, &longValue) == TCL_OK)
return PyLong_FromLong(longValue);
/* If there is an error in the long conversion,
fall through to wideInt handling. */
}

if (value->typePtr == tkapp->IntType ||
value->typePtr == tkapp->WideIntType) {
//fprintf(stderr, "fromWideIntObj\n");
result = fromWideIntObj(tkapp, value);
if (result != NULL || PyErr_Occurred())
return result;
Expand Down Expand Up @@ -1165,13 +1193,6 @@ FromObj(TkappObject *tkapp, Tcl_Obj *value)
return unicodeFromTclObj(value);
}

if (tkapp->BooleanType == NULL &&
strcmp(value->typePtr->name, "booleanString") == 0) {
/* booleanString type is not registered in Tcl */
tkapp->BooleanType = value->typePtr;
return fromBoolean(tkapp, value);
}

if (tkapp->BignumType == NULL &&
strcmp(value->typePtr->name, "bignum") == 0) {
/* bignum type is not registered in Tcl */
Expand Down
0