summaryrefslogtreecommitdiffstats
path: root/Lib/lib-tk
diff options
context:
space:
mode:
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':