diff options
| -rw-r--r-- | Lib/lib-tk/ScrolledText.py | 4 | ||||
| -rwxr-xr-x | Lib/tkinter/ScrolledText.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Lib/lib-tk/ScrolledText.py b/Lib/lib-tk/ScrolledText.py index cf6b2f13ff..4a67f369a2 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': diff --git a/Lib/tkinter/ScrolledText.py b/Lib/tkinter/ScrolledText.py index cf6b2f13ff..4a67f369a2 100755 --- 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': |