diff options
| author | Takayuki Shimizukawa <shimizukawa@gmail.com> | 2013-01-12 18:12:55 +0900 |
|---|---|---|
| committer | Takayuki Shimizukawa <shimizukawa@gmail.com> | 2013-01-12 18:12:55 +0900 |
| commit | 3a5277c14ce9623b4e99848998cbfd4498c103d7 (patch) | |
| tree | de8c8fd9a73df6b35fb29cf38942434d92de2679 /sphinx/ext/autodoc.py | |
| parent | f363ef400e93ddb96a77a1d2cedfc8dc94639e90 (diff) | |
| download | sphinx-git-3a5277c14ce9623b4e99848998cbfd4498c103d7.tar.gz | |
fix: autodoc documented descriptor class as attribute
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 4adf7b69a..825c63ff8 100644 --- a/sphinx/ext/autodoc.py +++ b/sphinx/ext/autodoc.py @@ -1191,7 +1191,7 @@ class AttributeDocumenter(ClassLevelDocumenter): def can_document_member(cls, member, membername, isattr, parent): isdatadesc = isdescriptor(member) and not \ isinstance(member, cls.method_types) and not \ - type(member).__name__ == "method_descriptor" + type(member).__name__ in ("type", "method_descriptor") return isdatadesc or (not isinstance(parent, ModuleDocumenter) and not inspect.isroutine(member) and not isinstance(member, class_types)) |