diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2006-06-17 19:03:26 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2006-06-17 19:03:26 (GMT) |
| commit | 6fb20aa92ce6497bf5c065ca34e2a9fdf02e300e (patch) | |
| tree | bcc6d539c2c47e409e2b94d0911bdf60757f6354 | |
| parent | 3798da0f92bcd4ace1cae465e83329b9b519096f (diff) | |
| download | cpython-6fb20aa92ce6497bf5c065ca34e2a9fdf02e300e.zip cpython-6fb20aa92ce6497bf5c065ca34e2a9fdf02e300e.tar.gz cpython-6fb20aa92ce6497bf5c065ca34e2a9fdf02e300e.tar.bz2 | |
Patch #815924: Restore ability to pass type= and icon=
| -rw-r--r-- | Lib/lib-tk/tkMessageBox.py | 7 | ||||
| -rw-r--r-- | 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() @@ -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 |