Use dictionary's update() method in _cnfmerge().

gvanrossum · gvanrossum · commit 65c78e18b593 · 1997-07-19T20:02:04.000Z
diff --git 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
@@ -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:
