summaryrefslogtreecommitdiff
path: root/Lib/tkinter/tix.py
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2011-10-28 14:52:29 +0200
committerFlorent Xicluna <florent.xicluna@gmail.com>2011-10-28 14:52:29 +0200
commitaabbda5354407cfe35097c7f17717a716a3d80c4 (patch)
treee15e7fe42975e08e567879ec8a949d4986ca4493 /Lib/tkinter/tix.py
parentac73b0c95e352563ecf0a4643b30215b9bdee1a5 (diff)
parent5d1155c08edf7f53eca804b2b6538636c2dfe711 (diff)
downloadcpython-git-aabbda5354407cfe35097c7f17717a716a3d80c4.tar.gz
Merge 3.2
Diffstat (limited to 'Lib/tkinter/tix.py')
-rw-r--r--Lib/tkinter/tix.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/tkinter/tix.py b/Lib/tkinter/tix.py
index 4884e2260b..18866c432d 100644
--- a/Lib/tkinter/tix.py
+++ b/Lib/tkinter/tix.py
@@ -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)