Merged revisions 70221 via svnmerge from

svn+ssh://pythondev/python/branches/py3k

................
  r70221 | guilherme.polo | 2009-03-06 22:54:57 -0300 (Fri, 06 Mar 2009) | 15 lines

  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/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
index af49170568a31bb727a2571db56dc43efbb067d5..a4fca3ecd70c5fd214becd2184cfa1da5968a8bc 100644 (file)
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -3030,7 +3030,7 @@ class Text(Widget):
         args.append(pattern)
         args.append(index)
         if stopindex: args.append(stopindex)
-        return self.tk.call(tuple(args))
+        return str(self.tk.call(tuple(args)))
     def see(self, index):
         """Scroll such that the character at INDEX is visible."""
         self.tk.call(self._w, 'see', index)

diff --git a/Misc/NEWS b/Misc/NEWS
index 52a0c542d624dc8b39121b78fd0f27cc049d2089..7b30f20a661f2059f7f06f094411067ada3c7776 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -149,6 +149,12 @@ Core and Builtins
 Library
 -------
 
+- 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.
+
+- Issue #5193: Guarantee that tkinter.Text.search returns a string.
+
 - Issue #5334: array.fromfile() failed to insert values when EOFError was raised.
 
 - Issue #5385: Fixed mmap crash after resize failure on windows.

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 9b417b4ff05010fae32bbc2fbabd58a3ba12322b..5f74851d59e5c86c9eaf5406334dc4653871a8f5 100644 (file)
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -1986,7 +1986,7 @@ PythonCmd(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[])
                return PythonCmd_Error(interp);
        }
        else {
-               Tcl_SetObjResult(Tkapp_Interp(self), obj_res);
+               Tcl_SetObjResult(interp, obj_res);
                rv = TCL_OK;
        }