summaryrefslogtreecommitdiffstats
path: root/Lib/lib-tk
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1997-02-12 16:49:57 (GMT)
committerGuido van Rossum <guido@python.org>1997-02-12 16:49:57 (GMT)
commit17ca9928188d9d1e22a06b3d562e32616ca64524 (patch)
treeb9bd0ae106e811df31066e8d5e59be9ce8767d0f /Lib/lib-tk
parent50b82e8e180c78c5ec1ab72de5016c3ae49b473e (diff)
downloadcpython-17ca9928188d9d1e22a06b3d562e32616ca64524.zip
cpython-17ca9928188d9d1e22a06b3d562e32616ca64524.tar.gz
cpython-17ca9928188d9d1e22a06b3d562e32616ca64524.tar.bz2
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.)
Diffstat (limited to 'Lib/lib-tk')
-rw-r--r--Lib/lib-tk/ScrolledText.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/lib-tk/ScrolledText.py b/Lib/lib-tk/ScrolledText.py
index cf6b2f1..4a67f36 100644
--- 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':