| commit | 65c78e18b593955c231006dcb5862b53d3a2f169 | [log] [tgz] |
|---|---|---|
| author | Guido van Rossum <guido@python.org> | Sat Jul 19 20:02:04 1997 +0000 |
| committer | Guido van Rossum <guido@python.org> | Sat Jul 19 20:02:04 1997 +0000 |
| tree | 7af4d33882c638dcde5b15943e905f499afe5e20 | |
| parent | 7a337c1c7982fbbd631213e57f41eb86321ea7c4 [diff] [blame] |
Use dictionary's update() method in _cnfmerge().
diff --git a/Lib/tkinter/Tkinter.py b/Lib/tkinter/Tkinter.py index 9d5fa6f..2c47480 100755 --- a/Lib/tkinter/Tkinter.py +++ b/Lib/tkinter/Tkinter.py
@@ -43,8 +43,12 @@ else: cnf = {} for c in _flatten(cnfs): - for k, v in c.items(): - cnf[k] = v + try: + cnf.update(c) + except (AttributeError, TypeError), msg: + print "_cnfmerge: fallback due to:", msg + for k, v in c.items(): + cnf[k] = v return cnf class Event: