Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Return results from Python callbacks to Tcl as Tcl objects. 

Fixes Tk issue #1851526
This commit is contained in:
Martin v. Löwis 2008-01-01 21:05:17 +00:00
parent 9a1d8cec11
commit 17cb5cf403
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Modules/_tkinter.c
View File

@ -1992,9 +1992,9 @@ static int
PythonCmd(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[])
{
PythonCmd_ClientData *data = (PythonCmd_ClientData *)clientData;
PyObject *self, *func, *arg, *res, *tmp;
PyObject *self, *func, *arg, *res;
int i, rv;
char *s;
Tcl_Obj *obj_res;
ENTER_PYTHON
@ -2021,24 +2021,17 @@ PythonCmd(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[])
if (res == NULL)
return PythonCmd_Error(interp);
if (!(tmp = PyList_New(0))) {
obj_res = AsObj(res);
if (obj_res == NULL) {
Py_DECREF(res);
return PythonCmd_Error(interp);
}
s = AsString(res, tmp);
if (s == NULL) {
Py_DECREF(res);
Py_DECREF(tmp);
return PythonCmd_Error(interp);
}
else {
Tcl_SetResult(Tkapp_Interp(self), s, TCL_VOLATILE);
Tcl_SetObjResult(Tkapp_Interp(self), obj_res);
rv = TCL_OK;
}
Py_DECREF(res);
Py_DECREF(tmp);
LEAVE_PYTHON