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

Merge branch '3.0.x' into 7364_autosummary_crashed

Browse Source
This commit is contained in:
Takeshi KOMIYA 2020-03-25 01:31:39 +09:00 committed by GitHub
commit dbf1982995
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -17,6 +17,7 @@ Bugs fixed
---------- ----------
* #7364: autosummary: crashed when :confval:`autosummary_generate` is False * #7364: autosummary: crashed when :confval:`autosummary_generate` is False
* #7370: autosummary: raises UnboundLocalError when unknown module given
Testing Testing
-------- --------

2
sphinx/ext/autosummary/generate.py
View File

@ -279,7 +279,7 @@ def generate_autosummary_docs(sources: List[str], output_dir: str = None,
try: try:
name, obj, parent, mod_name = import_by_name(entry.name) name, obj, parent, mod_name = import_by_name(entry.name)
except ImportError as e: except ImportError as e:
_warn(__('[autosummary] failed to import %r: %s') % (name, e)) _warn(__('[autosummary] failed to import %r: %s') % (entry.name, e))
continue continue
content = generate_autosummary_content(name, obj, parent, template, entry.template, content = generate_autosummary_content(name, obj, parent, template, entry.template,