From 6fb20aa92ce6497bf5c065ca34e2a9fdf02e300e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sat, 17 Jun 2006 19:03:26 +0000 Subject: Patch #815924: Restore ability to pass type= and icon= --- Lib/lib-tk/tkMessageBox.py | 7 ++++--- Misc/NEWS | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Lib/lib-tk/tkMessageBox.py b/Lib/lib-tk/tkMessageBox.py index 25071fe..aff069b 100644 --- a/Lib/lib-tk/tkMessageBox.py +++ b/Lib/lib-tk/tkMessageBox.py @@ -63,9 +63,10 @@ class Message(Dialog): # # convenience stuff -def _show(title=None, message=None, icon=None, type=None, **options): - if icon: options["icon"] = icon - if type: options["type"] = type +# Rename _icon and _type options to allow overriding them in options +def _show(title=None, message=None, _icon=None, _type=None, **options): + if _icon and "icon" not in options: options["icon"] = _icon + if _type and "type" not in options: options["type"] = _type if title: options["title"] = title if message: options["message"] = message res = Message(**options).show() diff --git a/Misc/NEWS b/Misc/NEWS index 7021236..7bc17f7 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -163,6 +163,9 @@ Extension Modules Library ------- +- Patch #815924: Restore ability to pass type= and icon= in tkMessageBox + functions. + - Patch #812986: Update turtle output even if not tracing. - Patch #1494750: Destroy master after deleting children in -- cgit v0.12