Merge pull request #3675 from tk0miya/3657_epub_builder_crashes

Fix #3657: EPUB builder crashes if document startswith genindex exists
This commit is contained in:
Takeshi KOMIYA 2017-04-27 22:00:31 +09:00 committed by GitHub
commit 44f9146488
2 changed files with 2 additions and 1 deletions

View File

@ -16,6 +16,7 @@ Bugs fixed
* #3614: Sphinx crashes with requests-2.5.0 * #3614: Sphinx crashes with requests-2.5.0
* #3618: autodoc crashes with tupled arguments * #3618: autodoc crashes with tupled arguments
* #3664: No space after the bullet in items of a latex list produced by Sphinx * #3664: No space after the bullet in items of a latex list produced by Sphinx
* #3657: EPUB builder crashes if document startswith genindex exists
Testing Testing
-------- --------

View File

@ -500,7 +500,7 @@ class EpubBuilder(StandaloneHTMLBuilder):
This method is overwritten for genindex pages in order to fix href link This method is overwritten for genindex pages in order to fix href link
attributes. attributes.
""" """
if pagename.startswith('genindex'): if pagename.startswith('genindex') and 'genindexentries' in addctx:
if not self.use_index: if not self.use_index:
return return
self.fix_genindex(addctx['genindexentries']) self.fix_genindex(addctx['genindexentries'])