[Python-checkins] r70222 - in python/branches/release30-maint: Lib/tkinter/__init__.py Misc/NEWS Modules/_tkinter.c

[guilherme.polo]

Author: guilherme.polo
Date: Sat Mar  7 02:58:16 2009
New Revision: 70222

Log:
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.
  ........
................


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Lib/tkinter/__init__.py
   python/branches/release30-maint/Misc/NEWS
   python/branches/release30-maint/Modules/_tkinter.c

Modified: python/branches/release30-maint/Lib/tkinter/__init__.py
==============================================================================
--- python/branches/release30-maint/Lib/tkinter/__init__.py	(original)
+++ python/branches/release30-maint/Lib/tkinter/__init__.py	Sat Mar  7 02:58:16 2009
@@ -3030,7 +3030,7 @@
         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)

Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Sat Mar  7 02:58:16 2009
@@ -149,6 +149,12 @@
 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.

Modified: python/branches/release30-maint/Modules/_tkinter.c
==============================================================================
--- python/branches/release30-maint/Modules/_tkinter.c	(original)
+++ python/branches/release30-maint/Modules/_tkinter.c	Sat Mar  7 02:58:16 2009
@@ -1986,7 +1986,7 @@
 		return PythonCmd_Error(interp);
 	}
 	else {
-		Tcl_SetObjResult(Tkapp_Interp(self), obj_res);
+		Tcl_SetObjResult(interp, obj_res);
 		rv = TCL_OK;
 	}