mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 19:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #21526: Tkinter now supports new boolean type in Tcl 8.5.

Browse source
This commit is contained in:
Serhiy Storchaka 2015-04-02 10:35:57 +03:00
parent f41f8f9974
commit f7de3dd02d
3 changed files with 51 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Modules/_tkinter.c
View file

@ -242,13 +242,14 @@ typedef struct {
int dispatching;
/* We cannot include tclInt.h, as this is internal.
So we cache interesting types here. */
Tcl_ObjType *BooleanType;
Tcl_ObjType *ByteArrayType;
Tcl_ObjType *DoubleType;
Tcl_ObjType *IntType;
Tcl_ObjType *ListType;
Tcl_ObjType *ProcBodyType;
Tcl_ObjType *StringType;
const Tcl_ObjType *OldBooleanType;
const Tcl_ObjType *BooleanType;
const Tcl_ObjType *ByteArrayType;
const Tcl_ObjType *DoubleType;
const Tcl_ObjType *IntType;
const Tcl_ObjType *ListType;
const Tcl_ObjType *ProcBodyType;
const Tcl_ObjType *StringType;
} TkappObject;
#define Tkapp_Interp(v) (((TkappObject *) (v))->interp)
@ -577,7 +578,8 @@ Tkapp_New(char *screenName, char *className,
}
#endif
v->BooleanType = Tcl_GetObjType("boolean");
v->OldBooleanType = Tcl_GetObjType("boolean");
v->BooleanType = Tcl_GetObjType("booleanString");
v->ByteArrayType = Tcl_GetObjType("bytearray");
v->DoubleType = Tcl_GetObjType("double");
v->IntType = Tcl_GetObjType("int");
@ -979,20 +981,29 @@ AsObj(PyObject *value)
}
}
static PyObject *
fromBoolean(PyObject* tkapp, Tcl_Obj *value)
{
int boolValue;
if (Tcl_GetBooleanFromObj(Tkapp_Interp(tkapp), value, &boolValue) == TCL_ERROR)
return Tkinter_Error(tkapp);
return PyBool_FromLong(boolValue);
}
static PyObject*
FromObj(PyObject* tkapp, Tcl_Obj *value)
{
PyObject *result = NULL;
TkappObject *app = (TkappObject*)tkapp;
Tcl_Interp *interp = Tkapp_Interp(tkapp);
if (value->typePtr == NULL) {
return unicodeFromTclStringAndSize(value->bytes, value->length);
}
if (value->typePtr == app->BooleanType) {
result = value->internalRep.longValue ? Py_True : Py_False;
Py_INCREF(result);
return result;
if (value->typePtr == app->BooleanType ||
value->typePtr == app->OldBooleanType) {
return fromBoolean(tkapp, value);
}
if (value->typePtr == app->ByteArrayType) {
@ -1015,15 +1026,14 @@ FromObj(PyObject* tkapp, Tcl_Obj *value)
PyObject *elem;
Tcl_Obj *tcl_elem;
status = Tcl_ListObjLength(Tkapp_Interp(tkapp), value, &size);
status = Tcl_ListObjLength(interp, value, &size);
if (status == TCL_ERROR)
return Tkinter_Error(tkapp);
result = PyTuple_New(size);
if (!result)
return NULL;
for (i = 0; i < size; i++) {
status = Tcl_ListObjIndex(Tkapp_Interp(tkapp),
value, i, &tcl_elem);
status = Tcl_ListObjIndex(interp, value, i, &tcl_elem);
if (status == TCL_ERROR) {
Py_DECREF(result);
return Tkinter_Error(tkapp);
@ -1048,6 +1058,15 @@ FromObj(PyObject* tkapp, Tcl_Obj *value)
Tcl_GetCharLength(value));
}
#if TK_VERSION_HEX >= 0x08050000
if (app->BooleanType == NULL &&
strcmp(value->typePtr->name, "booleanString") == 0) {
/* booleanString type is not registered in Tcl */
app->BooleanType = value->typePtr;
return fromBoolean(tkapp, value);
}
#endif
return newPyTclObject(value);
}