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 pull request #4883 from tk0miya/4878_ignore_invalid_extension_metadata

Browse Source 
Fix #4878: Crashed with extension which returns invalid metadata
This commit is contained in:
Takeshi KOMIYA 2018-04-23 01:18:41 +09:00 committed by GitHub
commit a0cb99ee71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -33,6 +33,7 @@ Bugs fixed
* #4871: html search: Upper characters problem in German * #4871: html search: Upper characters problem in German
* #4717: latex: Compilation for German docs failed with LuaLaTeX and XeLaTeX * #4717: latex: Compilation for German docs failed with LuaLaTeX and XeLaTeX
* #4459: duplicated labels detector does not work well in parallel build * #4459: duplicated labels detector does not work well in parallel build
* #4878: Crashed with extension which returns invalid metadata
Testing Testing
-------- --------

1
sphinx/registry.py
View File

@ -340,6 +340,7 @@ class SphinxComponentRegistry(object):
logger.warning(__('extension %r returned an unsupported object from ' logger.warning(__('extension %r returned an unsupported object from '
'its setup() function; it should return None or a ' 'its setup() function; it should return None or a '
'metadata dictionary'), extname) 'metadata dictionary'), extname)
metadata = {}
app.extensions[extname] = Extension(extname, mod, **metadata) app.extensions[extname] = Extension(extname, mod, **metadata)
app._setting_up_extension.pop() app._setting_up_extension.pop()