mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

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

4
Lib/idlelib/rpc.py
View file

@ -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):