From 5b39123aa4d2988fc773003d166c2bde590ea080 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Tue, 16 Oct 2018 13:48:01 -0500 Subject: [PATCH] Update sphinx logging to not use app object Logging via the application object was deprecated in sphinx 1.6 and is now removed in the master branch that will become 2.0. This updates our sphinx extension to use the recommended sphinx.util.logging instead. Closes-bug: #1798174 Change-Id: Ie66579146d68680905c3eac3d256369309130cf4 Signed-off-by: Sean McGinnis --- stevedore/sphinxext.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/stevedore/sphinxext.py b/stevedore/sphinxext.py index 3c9b6ce..8ca88bb 100644 --- a/stevedore/sphinxext.py +++ b/stevedore/sphinxext.py @@ -18,10 +18,13 @@ from docutils import nodes from docutils.parsers import rst from docutils.parsers.rst import directives from docutils.statemachine import ViewList +from sphinx.util import logging from sphinx.util.nodes import nested_parse_with_titles from stevedore import extension +LOG = logging.getLogger(__name__) + def _get_docstring(plugin): return inspect.getdoc(plugin) or '' @@ -72,16 +75,13 @@ class ListPluginsDirective(rst.Directive): has_content = True def run(self): - env = self.state.document.settings.env - app = env.app - namespace = ' '.join(self.content).strip() - app.info('documenting plugins from %r' % namespace) + LOG.info('documenting plugins from %r' % namespace) overline_style = self.options.get('overline-style', '') underline_style = self.options.get('underline-style', '=') def report_load_failure(mgr, ep, err): - app.warn(u'Failed to load %s: %s' % (ep.module_name, err)) + LOG.warning(u'Failed to load %s: %s' % (ep.module_name, err)) mgr = extension.ExtensionManager( namespace, @@ -111,5 +111,5 @@ class ListPluginsDirective(rst.Directive): def setup(app): - app.info('loading stevedore.sphinxext') + LOG.info('loading stevedore.sphinxext') app.add_directive('list-plugins', ListPluginsDirective)