Merge pull request #4703 from tk0miya/fix_autodoc_logging

Fix autodoc: crashed when invalid options given
This commit is contained in:
Takeshi KOMIYA
2018-03-03 20:20:52 +09:00
committed by GitHub
2 changed files with 3 additions and 2 deletions

View File

@@ -18,6 +18,7 @@ Bugs fixed
* #4669: sphinx.build_main and sphinx.make_main throw NameError
* #4685: autosummary emits meaningless warnings
* autodoc: crashed when invalid options given
Testing
--------

View File

@@ -58,7 +58,7 @@ class DocumenterBridge(object):
def warn(self, msg):
# type: (unicode) -> None
logger.warning(msg, line=self.lineno)
logger.warning(msg, location=(self.env.docname, self.lineno))
def process_documenter_options(documenter, config, options):
@@ -125,7 +125,7 @@ class AutodocDirective(Directive):
except (KeyError, ValueError, TypeError) as exc:
# an option is either unknown or has a wrong type
logger.error('An option to %s is either unknown or has an invalid value: %s' %
(self.name, exc), line=lineno)
(self.name, exc), location=(source, lineno))
return []
# generate the output