Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #9756: autodoc: Crashed if classmethod does not have __func__ attribute #9760

Merged
merged 2 commits into from Oct 26, 2021
Merged

Fix #9756: autodoc: Crashed if classmethod does not have __func__ attribute #9760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ced8895
Fix #9756: autodoc: Crashed if classmethod does not have __func__ att…
tk0miya Oct 22, 2021
096108c
Merge branch '4.x' into 9756_classmethod_not_having_func
tk0miya Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES
View file
Open in desktop
Expand Up @@ -63,6 +63,7 @@ Bugs fixed
generic class
* #9755: autodoc: memory addresses are shown for aliases
* #9752: autodoc: Failed to detect type annotation for slots attribute
* #9756: autodoc: Crashed if classmethod does not have __func__ attribute
* #9630: autosummary: Failed to build summary table if :confval:`primary_domain`
is not 'py'
* #9670: html: Fix download file with special characters
Expand Down
2 changes: 1 addition & 1 deletion sphinx/util/inspect.py
View file
Open in desktop
Expand Up @@ -865,7 +865,7 @@ def getdoc(obj: Any, attrgetter: Callable = safe_getattr,
if cls and name and isclassmethod(obj, cls, name):
for basecls in getmro(cls):
meth = basecls.__dict__.get(name)
if meth:
if meth and hasattr(meth, '__func__'):
return getdoc(meth.__func__)

doc = attrgetter(obj, '__doc__', None)
Expand Down