Merge pull request #7520 from a-recknagel/3.0.x

fix for #7516
sphinx-doc · Apr 20, 2020 · a65db71 · a65db71
2 parents d08d4de + 84413ed
commit a65db71
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/sphinx/ext/autodoc/__init__.py b/sphinx/ext/autodoc/__init__.py
@@ -578,9 +578,9 @@ def is_filtered_inherited_member(name: str) -> bool:
                 isprivate = membername.startswith('_')
 
             keep = False
-            if getattr(member, '__sphinx_mock__', False):
+            if safe_getattr(member, '__sphinx_mock__', False):
                 # mocked module or object
-                keep = False
+                pass
             elif want_all and membername.startswith('__') and \
                     membername.endswith('__') and len(membername) > 4:
                 # special __methods__