mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-28 03:13:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source
This commit is contained in:
Guido van Rossum 1997-07-19 20:02:04 +00:00
parent 7a337c1c79
commit 65c78e18b5
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/lib-tk/Tkinter.py
View file

@ -43,6 +43,10 @@ def _cnfmerge(cnfs):
else: else:
cnf = {} cnf = {}
for c in _flatten(cnfs): 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(): for k, v in c.items():
cnf[k] = v cnf[k] = v
return cnf return cnf

4
Lib/tkinter/Tkinter.py
View file

@ -43,6 +43,10 @@ def _cnfmerge(cnfs):
else: else:
cnf = {} cnf = {}
for c in _flatten(cnfs): 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(): for k, v in c.items():
cnf[k] = v cnf[k] = v
return cnf return cnf