[Python-checkins] r70220 - in python/branches/release26-maint: Lib/lib-tk/Tkinter.py Misc/NEWS Modules/_tkinter.c
guilherme.polo
python-checkins at python.org
Sat Mar 7 02:51:49 CET 2009
Author: guilherme.polo
Date: Sat Mar 7 02:51:48 2009
New Revision: 70220
Log:
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/release26-maint/ (props changed)
python/branches/release26-maint/Lib/lib-tk/Tkinter.py
python/branches/release26-maint/Misc/NEWS
python/branches/release26-maint/Modules/_tkinter.c
Modified: python/branches/release26-maint/Lib/lib-tk/Tkinter.py
==============================================================================
--- python/branches/release26-maint/Lib/lib-tk/Tkinter.py (original)
+++ python/branches/release26-maint/Lib/lib-tk/Tkinter.py Sat Mar 7 02:51:48 2009
@@ -3046,7 +3046,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/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS (original)
+++ python/branches/release26-maint/Misc/NEWS Sat Mar 7 02:51:48 2009
@@ -89,6 +89,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 #5385: Fixed mmap crash after resize failure on windows.
- Issue #5179: Fixed subprocess handle leak on failure on windows.
Modified: python/branches/release26-maint/Modules/_tkinter.c
==============================================================================
--- python/branches/release26-maint/Modules/_tkinter.c (original)
+++ python/branches/release26-maint/Modules/_tkinter.c Sat Mar 7 02:51:48 2009
@@ -2030,7 +2030,7 @@
return PythonCmd_Error(interp);
}
else {
- Tcl_SetObjResult(Tkapp_Interp(self), obj_res);
+ Tcl_SetObjResult(interp, obj_res);
rv = TCL_OK;
}
More information about the Python-checkins
mailing list