From 65c78e18b593955c231006dcb5862b53d3a2f169 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Sat, 19 Jul 1997 20:02:04 +0000 Subject: Use dictionary's update() method in _cnfmerge(). --- Lib/lib-tk/Tkinter.py | 8 ++++++-- Lib/tkinter/Tkinter.py | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py index 9d5fa6f..2c47480 100644 --- a/Lib/lib-tk/Tkinter.py +++ b/Lib/lib-tk/Tkinter.py @@ -43,8 +43,12 @@ def _cnfmerge(cnfs): 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: 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 @@ def _cnfmerge(cnfs): 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: -- cgit v0.12