From: Matthias Klose <doko@ubuntu.com>
Date: Tue, 16 Mar 2010 10:48:52 +0000 (+0000)
Subject: - Issue #4961: Inconsistent/wrong result of askyesno function in tkMessageBox
X-Git-Tag: v2.7b1~344
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b41168bab1ef241b63aba52528df63503970235;p=thirdparty%2FPython%2Fcpython.git

- Issue #4961: Inconsistent/wrong result of askyesno function in tkMessageBox
  with Tcl/Tk-8.5.
---

diff --git a/Lib/lib-tk/tkMessageBox.py b/Lib/lib-tk/tkMessageBox.py
index d14ca86febc0..9ee923576ffe 100644
--- a/Lib/lib-tk/tkMessageBox.py
+++ b/Lib/lib-tk/tkMessageBox.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 a6fe33ac74c7..35fddebf933d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -20,6 +20,9 @@ Core and Builtins
 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