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

diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py
index 9d5fa6f61e78095440c0872b56aed2735750f06e..2c47480cbe565dd1a1cc3236bf32d7442e93ad6b 100644 (file)
--- 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 9d5fa6f61e78095440c0872b56aed2735750f06e..2c47480cbe565dd1a1cc3236bf32d7442e93ad6b 100755 (executable)
--- 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: