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

Handle more instances of "__builtin__".

Browse Source
This commit is contained in:
Georg Brandl 2014-09-20 20:29:10 +02:00
parent 9fee57b1f6
commit febde8187e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sphinx/ext/autodoc.py
View File

@ -1109,7 +1109,7 @@ class ClassDocumenter(ModuleLevelDocumenter):
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 hasattr(self.object, '__bases__') and len(self.object.__bases__): if hasattr(self.object, '__bases__') and len(self.object.__bases__):
bases = [b.__module__ == '__builtin__' and bases = [b.__module__ in ('__builtin__', 'builtins') 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__)
for b in self.object.__bases__] for b in self.object.__bases__]

2
sphinx/ext/inheritance_diagram.py
View File

@ -195,7 +195,7 @@ class InheritanceGraph(object):
completely general. completely general.
""" """
module = cls.__module__ module = cls.__module__
if module == '__builtin__': if module in ('__builtin__', 'builtins'):
fullname = cls.__name__ fullname = cls.__name__
else: else:
fullname = '%s.%s' % (module, cls.__name__) fullname = '%s.%s' % (module, cls.__name__)