From: Guido van Rossum <guido@python.org>
Date: Sat, 19 Jul 1997 20:02:04 +0000 (+0000)
Subject: Use dictionary's update() method in _cnfmerge().
X-Git-Tag: v1.5a3~210
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=65c78e18b593955c231006dcb5862b53d3a2f169;p=python

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

diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py
index 9d5fa6f61e..2c47480cbe 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 9d5fa6f61e..2c47480cbe 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: