diff options
| author | Guilherme Polo <ggpolo@gmail.com> | 2009-03-07 01:51:48 (GMT) |
|---|---|---|
| committer | Guilherme Polo <ggpolo@gmail.com> | 2009-03-07 01:51:48 (GMT) |
| commit | c4f54fdfaabb269420eeb194a63f48641fb167e2 (patch) | |
| tree | 25fad3c6ef36b6257f53e694714c38ba4a14840f /Lib | |
| parent | a5322fb4ad9e9c34298da832c1f231a07985872e (diff) | |
| download | cpython-c4f54fdfaabb269420eeb194a63f48641fb167e2.zip cpython-c4f54fdfaabb269420eeb194a63f48641fb167e2.tar.gz cpython-c4f54fdfaabb269420eeb194a63f48641fb167e2.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/lib-tk/Tkinter.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py index fded249..825e58d 100644 --- a/Lib/lib-tk/Tkinter.py +++ b/Lib/lib-tk/Tkinter.py @@ -3046,7 +3046,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) |