Merged revisions 70218-70219 via svnmerge from
svn+ssh://pythondev/python/trunk
........
r70218 | guilherme.polo | 2009-03-06 22:19:12 -0300 (Fri, 06 Mar 2009) | 1 line
Fixed issue #5193: Guarantee that Tkinter.Text.search returns a string.
........
r70219 | guilherme.polo | 2009-03-06 22:47:49 -0300 (Fri, 06 Mar 2009) | 4 lines
Fixed issue #4792: Prevent a segfault in _tkinter by using the
guaranteed to be safe interp argument given to the PythonCmd in place
of the Tcl interpreter taken from a PythonCmd_ClientData.
........
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index d13690d..83501bf 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -2030,7 +2030,7 @@
return PythonCmd_Error(interp);
}
else {
- Tcl_SetObjResult(Tkapp_Interp(self), obj_res);
+ Tcl_SetObjResult(interp, obj_res);
rv = TCL_OK;
}