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

Merge 3.2

Browse source
This commit is contained in:
Florent Xicluna 2011-10-28 14:52:29 +02:00
commit aabbda5354
27 changed files with 51 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/tkinter/__init__.py
View file

@ -1037,7 +1037,7 @@ class Misc:
for k, v in cnf.items():
if v is not None:
if k[-1] == '_': k = k[:-1]
if hasattr(v, '__call__'):
if callable(v):
v = self._register(v)
elif isinstance(v, (tuple, list)):
nv = []
@ -1606,7 +1606,7 @@ class Wm:
"""Bind function FUNC to command NAME for this widget.
Return the function bound to NAME if None is given. NAME could be
e.g. "WM_SAVE_YOURSELF" or "WM_DELETE_WINDOW"."""
if hasattr(func, '__call__'):
if callable(func):
command = self._register(func)
else:
command = func
@ -3176,7 +3176,7 @@ class Image:
elif kw: cnf = kw
options = ()
for k, v in cnf.items():
if hasattr(v, '__call__'):
if callable(v):
v = self._register(v)
options = options + ('-'+k, v)
self.tk.call(('image', 'create', imgtype, name,) + options)
@ -3199,7 +3199,7 @@ class Image:
for k, v in _cnfmerge(kw).items():
if v is not None:
if k[-1] == '_': k = k[:-1]
if hasattr(v, '__call__'):
if callable(v):
v = self._register(v)
res = res + ('-'+k, v)
self.tk.call((self.name, 'config') + res)

2
Lib/tkinter/tix.py
View file

@ -405,7 +405,7 @@ class TixWidget(tkinter.Widget):
elif kw: cnf = kw
options = ()
for k, v in cnf.items():
if hasattr(v, '__call__'):
if callable(v):
v = self._register(v)
options = options + ('-'+k, v)
return master.tk.call(('image', 'create', imgtype,) + options)