diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2011-10-28 12:52:29 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2011-10-28 12:52:29 (GMT) |
| commit | aabbda5354407cfe35097c7f17717a716a3d80c4 (patch) | |
| tree | e15e7fe42975e08e567879ec8a949d4986ca4493 /Lib/idlelib | |
| parent | ac73b0c95e352563ecf0a4643b30215b9bdee1a5 (diff) | |
| parent | 5d1155c08edf7f53eca804b2b6538636c2dfe711 (diff) | |
| download | cpython-aabbda5354407cfe35097c7f17717a716a3d80c4.zip cpython-aabbda5354407cfe35097c7f17717a716a3d80c4.tar.gz cpython-aabbda5354407cfe35097c7f17717a716a3d80c4.tar.bz2 | |
Merge 3.2
Diffstat (limited to 'Lib/idlelib')
| -rw-r--r-- | Lib/idlelib/rpc.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py index 53f4aa8..ddb36bd 100644 --- a/Lib/idlelib/rpc.py +++ b/Lib/idlelib/rpc.py @@ -574,7 +574,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__: @@ -583,7 +583,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): |