diff options
author | Guido van Rossum <guido@python.org> | 1995-08-04 03:49:39 +0000 |
---|---|---|
committer | Guido van Rossum <guido@python.org> | 1995-08-04 03:49:39 +0000 |
commit | 456e207aba25bdad587112deb033e972cfa247dc (patch) | |
tree | 4bbfdb3c04ad0f3404cf25a289ae6f437a7f7d18 /Lib/lib-tk/Dialog.py | |
parent | 59df88052b9de47fb9468015d28b1e7a319dc97c (diff) | |
download | cpython-456e207aba25bdad587112deb033e972cfa247dc.tar.gz |
keyword parameter changes
Diffstat (limited to 'Lib/lib-tk/Dialog.py')
-rw-r--r-- | Lib/lib-tk/Dialog.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/lib-tk/Dialog.py b/Lib/lib-tk/Dialog.py index db8f5dabc0..67e7dc90ec 100644 --- a/Lib/lib-tk/Dialog.py +++ b/Lib/lib-tk/Dialog.py @@ -1,15 +1,17 @@ # Dialog.py -- Tkinter interface to the tk_dialog script. from Tkinter import * +from Tkinter import _cnfmerge -if TkVersion == 3.6: +if TkVersion <= 3.6: DIALOG_ICON = 'warning' else: DIALOG_ICON = 'questhead' class Dialog(Widget): - def __init__(self, master=None, cnf={}): + def __init__(self, master=None, cnf={}, **kw): + cnf = _cnfmerge((cnf, kw)) self.widgetName = '__dialog__' Widget._setup(self, master, cnf) self.num = self.tk.getint( |