Skip to content

C
cpython
Kaydet (Commit) 65c78e18 authored tarafından Guido van Rossum's avatar Guido van Rossum
Dosyalara gözat
Seçenekler

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

üst 7a337c1c
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 4 deletions
Lib/lib-tk/Tkinter.py
Dosyayı görüntüle @ 65c78e18
...@@ -43,8 +43,12 @@ def _cnfmerge(cnfs): ...@@ -43,8 +43,12 @@ def _cnfmerge(cnfs):
else: else:
cnf = {} cnf = {}
for c in _flatten(cnfs): for c in _flatten(cnfs):
for k, v in c.items(): try:
cnf[k] = v cnf.update(c)
except (AttributeError, TypeError), msg:
print "_cnfmerge: fallback due to:", msg
for k, v in c.items():
cnf[k] = v
return cnf return cnf
class Event: class Event:
......
Lib/tkinter/Tkinter.py
Dosyayı görüntüle @ 65c78e18
...@@ -43,8 +43,12 @@ def _cnfmerge(cnfs): ...@@ -43,8 +43,12 @@ def _cnfmerge(cnfs):
else: else:
cnf = {} cnf = {}
for c in _flatten(cnfs): for c in _flatten(cnfs):
for k, v in c.items(): try:
cnf[k] = v cnf.update(c)
except (AttributeError, TypeError), msg:
print "_cnfmerge: fallback due to:", msg
for k, v in c.items():
cnf[k] = v
return cnf return cnf
class Event: class Event:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment