mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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

Browse source
This commit is contained in:
Serhiy Storchaka 2015-03-23 00:47:45 +02:00
parent 1b2f4d5f0c
commit f07a4b663d
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -23,6 +23,8 @@ Core and Builtins
Library Library
------- -------
- Issue #21526: Tkinter now supports new boolean type in Tcl 8.5.
- Issue #23647: Increase impalib's MAXLINE to accommodate modern mailbox sizes. - Issue #23647: Increase impalib's MAXLINE to accommodate modern mailbox sizes.
- Issue #23539: If body is None, http.client.HTTPConnection.request now sets - Issue #23539: If body is None, http.client.HTTPConnection.request now sets

20
Modules/_tkinter.c
View file

@ -229,6 +229,7 @@ typedef struct {
int dispatching; int dispatching;
/* We cannot include tclInt.h, as this is internal. /* We cannot include tclInt.h, as this is internal.
So we cache interesting types here. */ So we cache interesting types here. */
const Tcl_ObjType *OldBooleanType;
const Tcl_ObjType *BooleanType; const Tcl_ObjType *BooleanType;
const Tcl_ObjType *ByteArrayType; const Tcl_ObjType *ByteArrayType;
const Tcl_ObjType *DoubleType; const Tcl_ObjType *DoubleType;
@ -585,7 +586,8 @@ Tkapp_New(const char *screenName, const char *className,
} }
#endif #endif
v->BooleanType = Tcl_GetObjType("boolean"); v->OldBooleanType = Tcl_GetObjType("boolean");
v->BooleanType = Tcl_GetObjType("booleanString");
v->ByteArrayType = Tcl_GetObjType("bytearray"); v->ByteArrayType = Tcl_GetObjType("bytearray");
v->DoubleType = Tcl_GetObjType("double"); v->DoubleType = Tcl_GetObjType("double");
v->IntType = Tcl_GetObjType("int"); v->IntType = Tcl_GetObjType("int");
@ -1001,15 +1003,18 @@ FromObj(PyObject* tkapp, Tcl_Obj *value)
{ {
PyObject *result = NULL; PyObject *result = NULL;
TkappObject *app = (TkappObject*)tkapp; TkappObject *app = (TkappObject*)tkapp;
Tcl_Interp *interp = Tkapp_Interp(tkapp);
if (value->typePtr == NULL) { if (value->typePtr == NULL) {
return unicodeFromTclStringAndSize(value->bytes, value->length); return unicodeFromTclStringAndSize(value->bytes, value->length);
} }
if (value->typePtr == app->BooleanType) { if (value->typePtr == app->BooleanType ||
result = value->internalRep.longValue ? Py_True : Py_False; value->typePtr == app->OldBooleanType) {
Py_INCREF(result); int boolValue;
return result; if (Tcl_GetBooleanFromObj(interp, value, &boolValue) == TCL_ERROR)
return Tkinter_Error(tkapp);
return PyBool_FromLong(boolValue);
} }
if (value->typePtr == app->ByteArrayType) { if (value->typePtr == app->ByteArrayType) {
@ -1032,15 +1037,14 @@ FromObj(PyObject* tkapp, Tcl_Obj *value)
PyObject *elem; PyObject *elem;
Tcl_Obj *tcl_elem; Tcl_Obj *tcl_elem;
status = Tcl_ListObjLength(Tkapp_Interp(tkapp), value, &size); status = Tcl_ListObjLength(interp, value, &size);
if (status == TCL_ERROR) if (status == TCL_ERROR)
return Tkinter_Error(tkapp); return Tkinter_Error(tkapp);
result = PyTuple_New(size); result = PyTuple_New(size);
if (!result) if (!result)
return NULL; return NULL;
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
status = Tcl_ListObjIndex(Tkapp_Interp(tkapp), status = Tcl_ListObjIndex(interp, value, i, &tcl_elem);
value, i, &tcl_elem);
if (status == TCL_ERROR) { if (status == TCL_ERROR) {
Py_DECREF(result); Py_DECREF(result);
return Tkinter_Error(tkapp); return Tkinter_Error(tkapp);