[Python-checkins] r79130 - in python/branches/release26-maint: Lib/lib-tk/tkMessageBox.py Misc/NEWS

[matthias.klose]

Author: matthias.klose
Date: Sat Mar 20 03:12:35 2010
New Revision: 79130

Log:
Merged revisions 78988 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78988 | matthias.klose | 2010-03-16 11:48:52 +0100 (Di, 16 Mär 2010) | 3 lines
  
  - Issue #4961: Inconsistent/wrong result of askyesno function in tkMessageBox
    with Tcl/Tk-8.5.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/lib-tk/tkMessageBox.py
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Lib/lib-tk/tkMessageBox.py
==============================================================================
--- python/branches/release26-maint/Lib/lib-tk/tkMessageBox.py	(original)
+++ python/branches/release26-maint/Lib/lib-tk/tkMessageBox.py	Sat Mar 20 03:12:35 2010
@@ -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"

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Sat Mar 20 03:12:35 2010
@@ -15,6 +15,9 @@
 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.