Merged revisions 78988 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78988 | matthias.klose | 2010-03-16 11:48:52 +0100 (Tue, 16 Mar 2010) | 3 lines
- Issue #4961: Inconsistent/wrong result of askyesno function in tkMessageBox
with Tcl/Tk-8.5.
........
diff --git a/Lib/tkinter/messagebox.py b/Lib/tkinter/messagebox.py
index c934956..5c35d5a 100644
--- a/Lib/tkinter/messagebox.py
+++ b/Lib/tkinter/messagebox.py
@@ -70,11 +70,13 @@
if title: options["title"] = title
if message: options["message"] = message
res = Message(**options).show()
- # In some Tcl installations, Tcl converts yes/no into a boolean
+ # In some Tcl installations, yes/no is converted into a boolean.
if isinstance(res, bool):
- if res: return YES
+ if res:
+ return YES
return NO
- return res
+ # In others we get a Tcl_Obj.
+ return str(res)
def showinfo(title=None, message=None, **options):
"Show an info message"
diff --git a/Misc/NEWS b/Misc/NEWS
index 1afc832..84b2bb9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -283,6 +283,9 @@
Library
-------
+- Issue #4961: Inconsistent/wrong result of askyesno function in tkMessageBox
+ with Tcl/Tk-8.5.
+
- Issue #8140: extend compileall to compile single files. Add -i option.
- Issue #7356: ctypes.util: Make parsing of ldconfig output independent of