From: Martin v. Löwis <martin@v.loewis.de>
Date: Tue, 1 Jan 2008 21:05:17 +0000 (+0000)
Subject: Return results from Python callbacks to Tcl as Tcl objects.
X-Git-Tag: v2.6a1~791
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17cb5cf403c1a6da312588f6c8d076a249d59d08;p=python

Return results from Python callbacks to Tcl as Tcl objects.
Fixes Tk issue #1851526
---

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 8f5be851b1..3cef4e73a8 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