summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2011-10-28 12:45:05 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2011-10-28 12:45:05 (GMT)
commit5d1155c08edf7f53eca804b2b6538636c2dfe711 (patch)
treedcb2cf857c20dce837c82de7aea432ccf9a41355 /Lib/idlelib
parentf99e4b5dbef57e13dd603dcc0edd9b7318f08c28 (diff)
downloadcpython-5d1155c08edf7f53eca804b2b6538636c2dfe711.zip
cpython-5d1155c08edf7f53eca804b2b6538636c2dfe711.tar.gz
cpython-5d1155c08edf7f53eca804b2b6538636c2dfe711.tar.bz2
Closes #13258: Use callable() built-in in the standard library.
Diffstat (limited to 'Lib/idlelib')
-rw-r--r--Lib/idlelib/rpc.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py
index 0c56ccd..def4394 100644
--- a/Lib/idlelib/rpc.py
+++ b/Lib/idlelib/rpc.py
@@ -570,7 +570,7 @@ def _getmethods(obj, methods):
# Adds names to dictionary argument 'methods'
for name in dir(obj):
attr = getattr(obj, name)
- if hasattr(attr, '__call__'):
+ if callable(attr):
methods[name] = 1
if isinstance(obj, type):
for super in obj.__bases__:
@@ -579,7 +579,7 @@ def _getmethods(obj, methods):
def _getattributes(obj, attributes):
for name in dir(obj):
attr = getattr(obj, name)
- if not hasattr(attr, '__call__'):
+ if not callable(attr):
attributes[name] = 1
class MethodProxy(object):