Put support for a cnf dictionary back in, since it is still supported

by all true Tkinter widgets.  (Not that I *like* this module -- it
stinks, but until I have something better, I can't nuke it.)

diff --git a/Lib/lib-tk/ScrolledText.py b/Lib/lib-tk/ScrolledText.py
index cf6b2f13ff557790b53670e20a3607c823649bd5..4a67f369a2daaf69cfa7239b6e48fd203b9aeec0 100644 (file)
--- a/Lib/lib-tk/ScrolledText.py
+++ b/Lib/lib-tk/ScrolledText.py
@@ -14,7 +14,9 @@ from Tkinter import *
 from Tkinter import _cnfmerge
 
 class ScrolledText(Text):
-       def __init__(self, master=None, **cnf):
+       def __init__(self, master=None, cnf={}, **kw):
+               if kw:
+                       cnf = _cnfmerge((cnf, kw))
                fcnf = {}
                for k in cnf.keys():
                        if type(k) == ClassType or k == 'name':

diff --git a/Lib/tkinter/ScrolledText.py b/Lib/tkinter/ScrolledText.py
index cf6b2f13ff557790b53670e20a3607c823649bd5..4a67f369a2daaf69cfa7239b6e48fd203b9aeec0 100755 (executable)
--- a/Lib/tkinter/ScrolledText.py
+++ b/Lib/tkinter/ScrolledText.py
@@ -14,7 +14,9 @@ from Tkinter import *
 from Tkinter import _cnfmerge
 
 class ScrolledText(Text):
-       def __init__(self, master=None, **cnf):
+       def __init__(self, master=None, cnf={}, **kw):
+               if kw:
+                       cnf = _cnfmerge((cnf, kw))
                fcnf = {}
                for k in cnf.keys():
                        if type(k) == ClassType or k == 'name':