Qubes/core-admin-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dochelpers: handle legacy sphinx library

Browse Source
This commit is contained in:
Frédéric Pierret (fepitre) 2019-09-06 16:20:54 +02:00
parent ab8f487b50
commit 6df676c259
No known key found for this signature in database
GPG Key ID: 484010B5CDC576E2
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qubesadmin/tools/dochelpers.py
View File

@ -43,7 +43,10 @@ from sphinx.util import logging
import qubesadmin.tools import qubesadmin.tools
log = logging.getLogger(__name__) try:
log = logging.getLogger(__name__)
except AttributeError:
log = None
SUBCOMMANDS_TITLE = 'COMMANDS' SUBCOMMANDS_TITLE = 'COMMANDS'
OPTIONS_TITLE = 'OPTIONS' OPTIONS_TITLE = 'OPTIONS'
@ -225,7 +228,13 @@ class ManpageCheckVisitor(docutils.nodes.SparseNodeVisitor):
try: try:
parser = qubesadmin.tools.get_parser_for_command(command) parser = qubesadmin.tools.get_parser_for_command(command)
except ImportError: except ImportError:
log.warning('cannot import module for command') msg = 'cannot import module for command'
if log:
log.warning(msg)
else:
# Handle legacy
app.warn(msg)
self.parser = None self.parser = None
return return
except AttributeError: except AttributeError:
@ -281,7 +290,12 @@ def check_man_args(app, doctree, docname):
if os.path.basename(dirname) != 'manpages': if os.path.basename(dirname) != 'manpages':
return return
log.info('Checking arguments for {!r}'.format(command)) msg = 'Checking arguments for {!r}'.format(command)
if log:
log.info(msg)
else:
# Handle legacy
app.info(msg)
doctree.walk(ManpageCheckVisitor(app, command, doctree)) doctree.walk(ManpageCheckVisitor(app, command, doctree))