diff options
| author | shimizukawa <shimizukawa@gmail.com> | 2013-01-12 18:12:55 +0900 |
|---|---|---|
| committer | shimizukawa <shimizukawa@gmail.com> | 2013-01-12 18:12:55 +0900 |
| commit | e17cfb522d2a62321dde3e781098e524d8cf91e2 (patch) | |
| tree | de8c8fd9a73df6b35fb29cf38942434d92de2679 /sphinx | |
| parent | 3f309459018bea48cc731d4ca9d5fb9d8fc8e6a0 (diff) | |
| download | sphinx-e17cfb522d2a62321dde3e781098e524d8cf91e2.tar.gz | |
fix: autodoc documented descriptor class as attribute
Diffstat (limited to 'sphinx')
| -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 4adf7b69..825c63ff 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)) |