keyword parameter changes

diff --git a/Lib/lib-tk/Dialog.py b/Lib/lib-tk/Dialog.py
index db8f5dabc0f006f24f1af566edf8e2b053ef57ab..67e7dc90ecbb563203e491dde34e22184e4cf7c5 100644 (file)
--- 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 db8f5dabc0f006f24f1af566edf8e2b053ef57ab..67e7dc90ecbb563203e491dde34e22184e4cf7c5 100755 (executable)
--- 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(