traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
........
This commit is contained in:
Matthias Klose 2010-03-20 02:12:35 +00:00
parent 2db7bdf8b9
commit e0bc5dab99
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/lib-tk/tkMessageBox.py
View File

@ -70,11 +70,13 @@ def _show(title=None, message=None, _icon=None, _type=None, **options):
if title: options["title"] = title if title: options["title"] = title
if message: options["message"] = message if message: options["message"] = message
res = Message(**options).show() 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 isinstance(res, bool):
if res: return YES if res:
return YES
return NO return NO
return res # In others we get a Tcl_Obj.
return str(res)
def showinfo(title=None, message=None, **options): def showinfo(title=None, message=None, **options):
"Show an info message" "Show an info message"

3
Misc/NEWS
View File

@ -15,6 +15,9 @@ Core and Builtins
Library 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 - Issue #7356: ctypes.util: Make parsing of ldconfig output independent of
the locale. the locale.