Merge branch '3.0.x' into 7364_autosummary_crashed

This commit is contained in:
Takeshi KOMIYA authored and GitHub committed 2020-03-25 01:31:39 +09:00
commit dbf1982995
2 files changed
+2 -1

No files matched your search

+1
View File
@@ -17,6 +17,7 @@ Bugs fixed
----------
* #7364: autosummary: crashed when :confval:`autosummary_generate` is False
* #7370: autosummary: raises UnboundLocalError when unknown module given
Testing
--------
+1 -1
View File
@@ -279,7 +279,7 @@ def generate_autosummary_docs(sources: List[str], output_dir: str = None,
try:
name, obj, parent, mod_name = import_by_name(entry.name)
except ImportError as e:
_warn(__('[autosummary] failed to import %r: %s') % (name, e))
_warn(__('[autosummary] failed to import %r: %s') % (entry.name, e))
continue
content = generate_autosummary_content(name, obj, parent, template, entry.template,