IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

#362: In autodoc, check for the existence of `__self__` on function objects before accessing it.

Browse Source
This commit is contained in:
Georg Brandl 2010-04-04 18:52:29 +02:00
parent e8fe8584e4
commit f12991c93e
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -1,6 +1,9 @@
Release 0.6.6 (in development) Release 0.6.6 (in development)
============================== ==============================
* #362: In autodoc, check for the existence of ``__self__`` on
function objects before accessing it.
* #353: Strip leading and trailing whitespace when extracting * #353: Strip leading and trailing whitespace when extracting
search words in the search function. search words in the search function.

1
sphinx/ext/autodoc.py
View File

@ -982,6 +982,7 @@ class MethodDocumenter(ClassLevelDocumenter):
self.member_order = self.member_order - 1 self.member_order = self.member_order - 1
elif isinstance(self.object, FunctionType) or \ elif isinstance(self.object, FunctionType) or \
(isinstance(self.object, BuiltinFunctionType) and (isinstance(self.object, BuiltinFunctionType) and
hasattr(self.object, '__self__') and
self.object.__self__ is not None): self.object.__self__ is not None):
self.directivetype = 'staticmethod' self.directivetype = 'staticmethod'
# document class and static members before ordinary ones # document class and static members before ordinary ones