summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2010-03-16 10:48:52 (GMT)
committerMatthias Klose <doko@ubuntu.com>2010-03-16 10:48:52 (GMT)
commit8b41168bab1ef241b63aba52528df63503970235 (patch)
tree51571066395d3063c2c037502c2eb5815716fcc9
parent3cc8f211ed0d569836114d0d54c6298a21e6dde3 (diff)
downloadcpython-8b41168bab1ef241b63aba52528df63503970235.zip
cpython-8b41168bab1ef241b63aba52528df63503970235.tar.gz
cpython-8b41168bab1ef241b63aba52528df63503970235.tar.bz2
- Issue #4961: Inconsistent/wrong result of askyesno function in tkMessageBox
with Tcl/Tk-8.5.
-rw-r--r--Lib/lib-tk/tkMessageBox.py8
-rw-r--r--Misc/NEWS3
2 files changed, 8 insertions, 3 deletions
diff --git a/Lib/lib-tk/tkMessageBox.py b/Lib/lib-tk/tkMessageBox.py
index d14ca86..9ee9235 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 a6fe33a..35fddeb 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