diff options
author | R David Murray <rdmurray@bitdance.com> | 2013-03-19 06:32:35 (GMT) |
---|---|---|
committer | R David Murray <rdmurray@bitdance.com> | 2013-03-19 06:32:35 (GMT) |
commit | 52dfc74080a8bc6949ca713d862c9324ac62ca5c (patch) | |
tree | 6ec1a18089f33775ef8fd6eb454eac04f6e742b5 /Lib/pydoc.py | |
parent | 6227c6952e5b9ab4c41f027b5e971b6812e24efa (diff) | |
parent | 9929bc543a014f3c7f764d79a614fc8a9751d7ce (diff) | |
download | cpython-52dfc74080a8bc6949ca713d862c9324ac62ca5c.zip cpython-52dfc74080a8bc6949ca713d862c9324ac62ca5c.tar.gz cpython-52dfc74080a8bc6949ca713d862c9324ac62ca5c.tar.bz2 |
#17476: make allmethods actually return all methods.
This fixes a regression relative to Python2. (In 2, methods on a class were
unbound methods and matched the inspect queries being done, in 3 they are just
functions and so were missed).
This is an undocumented function that pydoc itself does not use, but
I found that numpy at least uses it in its documentation generator.
Original patch by Matt Bachmann.
Diffstat (limited to 'Lib/pydoc.py')
-rwxr-xr-x | Lib/pydoc.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py index fa531e9..9dce079 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -132,7 +132,10 @@ def stripid(text): return _re_stripid.sub(r'\1', text) def _is_some_method(obj): - return inspect.ismethod(obj) or inspect.ismethoddescriptor(obj) + return (inspect.isfunction(obj) or + inspect.ismethod(obj) or + inspect.isbuiltin(obj) or + inspect.ismethoddescriptor(obj)) def allmethods(cl): methods = {} |