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/pydoc.py | |
| 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/pydoc.py')
| -rwxr-xr-x | Lib/pydoc.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 211d3d7..caae46a 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -769,7 +769,7 @@ class HTMLDoc(Doc): push(msg) for name, kind, homecls, value in ok: base = self.docother(getattr(object, name), name, mod) - if hasattr(value, '__call__') or inspect.isdatadescriptor(value): + if callable(value) or inspect.isdatadescriptor(value): doc = getattr(value, "__doc__", None) else: doc = None @@ -1196,7 +1196,7 @@ location listed above. hr.maybe() push(msg) for name, kind, homecls, value in ok: - if hasattr(value, '__call__') or inspect.isdatadescriptor(value): + if callable(value) or inspect.isdatadescriptor(value): doc = getdoc(value) else: doc = None |