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

65c78e18 · Guido van Rossum · 7a337c1c · 65c78e18 · 65c78e18
Commit 65c78e18 authored Jul 19, 1997 by Guido van Rossum
Show whitespace changes
Inline Side-by-side

Showing with 12 additions and 4 deletions

Lib/lib-tk/Tkinter.py Lib/lib-tk/Tkinter.py +6 -2

Lib/tkinter/Tkinter.py Lib/tkinter/Tkinter.py +6 -2

No files found.
--- a/Lib/lib-tk/Tkinter.py
+++ b/Lib/lib-tk/Tkinter.py
@@ -43,6 +43,10 @@ def _cnfmerge(cnfs):
 	else:
 		cnf = {}
 		for c in _flatten(cnfs):
+			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

--- a/Lib/tkinter/Tkinter.py
+++ b/Lib/tkinter/Tkinter.py
@@ -43,6 +43,10 @@ def _cnfmerge(cnfs):
 	else:
 		cnf = {}
 		for c in _flatten(cnfs):
+			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