From 17cb5cf403c1a6da312588f6c8d076a249d59d08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Tue, 1 Jan 2008 21:05:17 +0000 Subject: Return results from Python callbacks to Tcl as Tcl objects. Fixes Tk issue #1851526 --- Modules/_tkinter.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index 8f5be85..3cef4e7 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -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))) { - Py_DECREF(res); - return PythonCmd_Error(interp); - } - - s = AsString(res, tmp); - if (s == NULL) { + obj_res = AsObj(res); + if (obj_res == 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 -- cgit v0.12