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

Fix autodoc: ImportError is replaced by AttributeError for deeper module

Browse Source
This commit is contained in:
Takeshi KOMIYA
2018-09-03 22:46:18 +09:00
parent daac35cda7
commit e07731e7b1
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@@ -30,6 +30,7 @@ Bugs fixed
* #5348: download reference to remote file is not displayed * #5348: download reference to remote file is not displayed
* #5282: html theme: ``pygments_style`` of theme was overrided by ``conf.py`` * #5282: html theme: ``pygments_style`` of theme was overrided by ``conf.py``
by default by default
* autodoc: ImportError is replaced by AttributeError for deeper module
Testing Testing
-------- --------

8
sphinx/ext/autodoc/importer.py
View File

@@ -168,13 +168,15 @@ def import_object(modname, objpath, objtype='', attrgetter=safe_getattr, warning
try: try:
module = None module = None
exc_on_importing = None
objpath = list(objpath) objpath = list(objpath)
while module is None: while module is None:
try: try:
module = import_module(modname, warningiserror=warningiserror) module = import_module(modname, warningiserror=warningiserror)
logger.debug('[autodoc] import %s => %r', modname, module) logger.debug('[autodoc] import %s => %r', modname, module)
except ImportError: except ImportError as exc:
logger.debug('[autodoc] import %s => failed', modname) logger.debug('[autodoc] import %s => failed', modname)
exc_on_importing = exc
if '.' in modname: if '.' in modname:
# retry with parent module # retry with parent module
modname, name = modname.rsplit('.', 1) modname, name = modname.rsplit('.', 1)
@@ -193,6 +195,10 @@ def import_object(modname, objpath, objtype='', attrgetter=safe_getattr, warning
object_name = attrname object_name = attrname
return [module, parent, object_name, obj] return [module, parent, object_name, obj]
except (AttributeError, ImportError) as exc: except (AttributeError, ImportError) as exc:
if isinstance(exc, AttributeError) and exc_on_importing:
# restore ImportError
exc = exc_on_importing
if objpath: if objpath:
errmsg = ('autodoc: failed to import %s %r from module %r' % errmsg = ('autodoc: failed to import %s %r from module %r' %
(objtype, '.'.join(objpath), modname)) (objtype, '.'.join(objpath), modname))