summaryrefslogtreecommitdiff
path: root/sphinx/ext/autodoc/__init__.py
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2022-06-17 02:19:33 +0900
committerTakeshi KOMIYA <i.tkomiya@gmail.com>2022-06-17 02:19:33 +0900
commit4d7558e968d74f73e11c5460fe095b51a5a9f172 (patch)
tree2f67856b0b2022caec491c37766280b77c48ed2f /sphinx/ext/autodoc/__init__.py
parent571b55328d401a6e1d50e37407df56586065a7be (diff)
parent949984c4e26671fdf5490c33cf90d4db118aaa86 (diff)
downloadsphinx-git-4d7558e968d74f73e11c5460fe095b51a5a9f172.tar.gz
Merge branch '5.0.x' into 5.x
Diffstat (limited to 'sphinx/ext/autodoc/__init__.py')
-rw-r--r--sphinx/ext/autodoc/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/sphinx/ext/autodoc/__init__.py b/sphinx/ext/autodoc/__init__.py
index e16ab8ce5..642e0cfd8 100644
--- a/sphinx/ext/autodoc/__init__.py
+++ b/sphinx/ext/autodoc/__init__.py
@@ -1670,7 +1670,8 @@ class ClassDocumenter(DocstringSignatureMixin, ModuleLevelDocumenter): # type:
self.add_line(' ' + _('Bases: %s') % ', '.join(base_classes), sourcename)
def get_object_members(self, want_all: bool) -> Tuple[bool, ObjectMembers]:
- members = get_class_members(self.object, self.objpath, self.get_attr)
+ members = get_class_members(self.object, self.objpath, self.get_attr,
+ self.config.autodoc_inherit_docstrings)
if not want_all:
if not self.options.members:
return False, [] # type: ignore