summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGinnis <sean.mcginnis@gmail.com>2018-10-16 13:48:01 -0500
committerSean McGinnis <sean.mcginnis@gmail.com>2018-10-16 13:52:37 -0500
commit5b39123aa4d2988fc773003d166c2bde590ea080 (patch)
treec674e484e4d382d1682f949be9af17a2fe4afc1b
parente43f7c57432f1d0b21e2a836e5ecaa6126f40296 (diff)
downloadstevedore-5b39123aa4d2988fc773003d166c2bde590ea080.tar.gz
Update sphinx logging to not use app object1.30.0
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 <sean.mcginnis@gmail.com>
-rw-r--r--stevedore/sphinxext.py12
1 files 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)