diff options
| author | Georg Brandl <georg@python.org> | 2010-04-06 09:23:03 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-04-06 09:23:03 +0200 |
| commit | 751e02c7671e4ae33b7ddbc7832433554336e7ac (patch) | |
| tree | d4b3d1b1f1fed3c1dd37029cf7fb4a485c765c5f /sphinx/ext/autodoc.py | |
| parent | f470bd38e66d0bb910b57858a1b6b4561b0cafff (diff) | |
| parent | 517b045f863bb2915a02f7b349a3d7b8422934b8 (diff) | |
| download | sphinx-git-751e02c7671e4ae33b7ddbc7832433554336e7ac.tar.gz | |
merge with trunk
Diffstat (limited to 'sphinx/ext/autodoc.py')
| -rw-r--r-- | sphinx/ext/autodoc.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py index 731c5f103..359689161 100644 --- a/sphinx/ext/autodoc.py +++ b/sphinx/ext/autodoc.py @@ -1010,6 +1010,7 @@ class MethodDocumenter(ClassLevelDocumenter): self.member_order = self.member_order - 1 elif isinstance(self.object, FunctionType) or \ (isinstance(self.object, BuiltinFunctionType) and + hasattr(self.object, '__self__') and self.object.__self__ is not None): self.directivetype = 'staticmethod' # document class and static members before ordinary ones |