Respect add_autodoc_attrgetter() even when inherited-members is set

2 files changed, 3 insertions, 3 deletions

diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py
index 45dbdcdb..58623cc5 100644
--- a/sphinx/ext/autodoc.py
+++ b/sphinx/ext/autodoc.py
@@ -523,7 +523,7 @@ class Documenter(object):
         elif self.options.inherited_members:
             # safe_getmembers() uses dir() which pulls in members from all
             # base classes
-            members = safe_getmembers(self.object)
+            members = safe_getmembers(self.object, attr_getter=self.get_attr)
         else:
             # __dict__ contains only the members directly defined in
             # the class (but get them via getattr anyway, to e.g. get
diff --git a/sphinx/util/inspect.py b/sphinx/util/inspect.py
index 8cd93eaf..95b7cb1e 100644
--- a/sphinx/util/inspect.py
+++ b/sphinx/util/inspect.py
@@ -78,12 +78,12 @@ def safe_getattr(obj, name, *defargs):
         raise AttributeError(name)
 
 
-def safe_getmembers(object, predicate=None):
+def safe_getmembers(object, predicate=None, attr_getter=safe_getattr):
     """A version of inspect.getmembers() that uses safe_getattr()."""
     results = []
     for key in dir(object):
         try:
-            value = safe_getattr(object, key, None)
+            value = attr_getter(object, key, None)
         except AttributeError:
             continue
         if not predicate or predicate(value):