diff options
| author | Georg Brandl <georg@python.org> | 2010-04-06 09:21:22 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-04-06 09:21:22 +0200 |
| commit | 517b045f863bb2915a02f7b349a3d7b8422934b8 (patch) | |
| tree | 14c3db227b9b2d57914772939fb0a4af8766ad9d /sphinx/ext/autodoc.py | |
| parent | bc9b50409a578a58600ada557c74adaf60383231 (diff) | |
| parent | 0ca72d419970ed7f4c6c7c84ca9617e39e39b052 (diff) | |
| download | sphinx-git-517b045f863bb2915a02f7b349a3d7b8422934b8.tar.gz | |
merge with 0.6
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 57cba83a8..ca96195eb 100644 --- a/sphinx/ext/autodoc.py +++ b/sphinx/ext/autodoc.py @@ -1002,6 +1002,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 |