From 9455063d1e063fc4c5a98721df2edd74f842e504 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Fri, 4 Aug 1995 03:49:39 +0000 Subject: [PATCH] keyword parameter changes --- Lib/lib-tk/Dialog.py | 6 ++++-- 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 db8f5dabc0f..67e7dc90ecb 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 db8f5dabc0f..67e7dc90ecb 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(