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

Closes #814: autodoc: Guard against strange type objects that don't have

Browse Source 
``__bases__``.
This commit is contained in:
Georg Brandl 2014-01-10 21:01:24 +01:00
parent fdb3a5ada8
commit 7a26dd0730
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@ -23,6 +23,11 @@ Bugs fixed
* #751: Allow production lists longer than a page in LaTeX by using longtable. * #751: Allow production lists longer than a page in LaTeX by using longtable.
* #764: Always look for stopwords lowercased in JS search.
* #814: autodoc: Guard against strange type objects that don't have
``__bases__``.
Documentation Documentation
------------- -------------

2
sphinx/ext/autodoc.py
View File

@ -1052,7 +1052,7 @@ class ClassDocumenter(ModuleLevelDocumenter):
# add inheritance info, if wanted # add inheritance info, if wanted
if not self.doc_as_attr and self.options.show_inheritance: if not self.doc_as_attr and self.options.show_inheritance:
self.add_line(u'', '<autodoc>') self.add_line(u'', '<autodoc>')
if len(self.object.__bases__): if hasattr(self.object, '__bases__') and len(self.object.__bases__):
bases = [b.__module__ == '__builtin__' and bases = [b.__module__ == '__builtin__' and
u':class:`%s`' % b.__name__ or u':class:`%s`' % b.__name__ or
u':class:`%s.%s`' % (b.__module__, b.__name__) u':class:`%s.%s`' % (b.__module__, b.__name__)