Merged revisions 78989 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78989 | matthias.klose | 2010-03-16 11:51:28 +0100 (Tue, 16 Mar 2010) | 10 lines

  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 c9349567f824a3335454f515c7ca1d90b65522fc..5c35d5adbaf85e0fe3bc3cbc83b0da19a994704b 100644 (file)
--- a/Lib/tkinter/messagebox.py
+++ b/Lib/tkinter/messagebox.py
@@ -70,11 +70,13 @@ def _show(title=None, message=None, _icon=None, _type=None, **options):
     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 29aae7993efaca4146a24bbc06d3f51aff04f1a4..4103a257df2aa498976da645dd882a8e9b920dad 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -17,6 +17,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #4961: Inconsistent/wrong result of askyesno function in tkMessageBox
+  with Tcl/Tk-8.5.
+
 - Issue #7356: ctypes.util: Make parsing of ldconfig output independent of
   the locale.