diff options
| author | Guido van Rossum <guido@python.org> | 1995-08-04 03:49:39 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1995-08-04 03:49:39 (GMT) |
| commit | 9455063d1e063fc4c5a98721df2edd74f842e504 (patch) | |
| tree | e384897d0c9778d07995bd794c872c03bdf630a3 | |
| parent | 5968badb65df9e53ab73ae79a614d97d61fe6b45 (diff) | |
| download | cpython-9455063d1e063fc4c5a98721df2edd74f842e504.zip cpython-9455063d1e063fc4c5a98721df2edd74f842e504.tar.gz cpython-9455063d1e063fc4c5a98721df2edd74f842e504.tar.bz2 | |
keyword parameter changes
| -rw-r--r-- | Lib/lib-tk/Dialog.py | 6 | ||||
| -rwxr-xr-x | Lib/tkinter/Dialog.py | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Lib/lib-tk/Dialog.py b/Lib/lib-tk/Dialog.py index db8f5da..67e7dc9 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( diff --git a/Lib/tkinter/Dialog.py b/Lib/tkinter/Dialog.py index db8f5da..67e7dc9 100755 --- a/Lib/tkinter/Dialog.py +++ b/Lib/tkinter/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( |