diff options
| author | Julian Andres Klode <jak@debian.org> | 2011-05-04 17:18:59 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2011-05-04 17:18:59 +0200 |
| commit | c8ea437096f26821111f0eb1b4dd797d3368db1d (patch) | |
| tree | fc6540fdad32ed18f9f13bd7a9b0f1e017683749 | |
| parent | 748799b0044adb483518a82a363a4fb85f6fce1f (diff) | |
| download | sphinx-c8ea437096f26821111f0eb1b4dd797d3368db1d.tar.gz | |
Correctly treat built-in method (method descriptors) as methods
This fixes a bug where method descriptors were treated as data
descriptors. As the builtin_method_descriptor type is not exported
anywhere in Python, we check for the name here. As we know that
it is a descriptor, this should not be a problem.
| -rw-r--r-- | sphinx/ext/autodoc.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py index d184342e..f72e7dfa 100644 --- a/sphinx/ext/autodoc.py +++ b/sphinx/ext/autodoc.py @@ -1072,7 +1072,8 @@ class AttributeDocumenter(ClassLevelDocumenter): @classmethod def can_document_member(cls, member, membername, isattr, parent): isdatadesc = isdescriptor(member) and not \ - isinstance(member, cls.method_types) + isinstance(member, cls.method_types) and not \ + type(member).__name__ == "method_descriptor" return isdatadesc or \ (isattr and not isinstance(parent, ModuleDocumenter)) |
