diff options
| author | A. Jesse Jiryu Davis <jesse@mongodb.com> | 2013-01-31 12:22:11 -0500 |
|---|---|---|
| committer | A. Jesse Jiryu Davis <jesse@mongodb.com> | 2013-01-31 12:22:11 -0500 |
| commit | 6945551c20357906979e1857b512f2a27d30890a (patch) | |
| tree | 3559540db909a700642d01f21820994fb823d443 /sphinx/ext/autodoc.py | |
| parent | a86ea846e2cade766dc4c7a82f739e6bc5babcad (diff) | |
| download | sphinx-git-6945551c20357906979e1857b512f2a27d30890a.tar.gz | |
Respect add_autodoc_attrgetter() even when inherited-members is set
Diffstat (limited to 'sphinx/ext/autodoc.py')
| -rw-r--r-- | sphinx/ext/autodoc.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py index 45dbdcdb4..58623cc56 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 |