IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix-up where the ImportError is caught if the manpage writer is missing.

Browse Source
This commit is contained in:
Georg Brandl 2010-02-21 12:01:27 +01:00
parent 5244396781
commit 94ea515ad7
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sphinx/builders/manpage.py
View File

@ -20,11 +20,7 @@ from sphinx.builders import Builder
from sphinx.environment import NoUri
from sphinx.util.nodes import inline_all_toctrees
from sphinx.util.console import bold, darkgreen
try:
from sphinx.writers.manpage import ManualPageWriter
has_manpage_writer = True
except ImportError:
has_manpage_writer = False
from sphinx.writers.manpage import ManualPageWriter, has_manpage_writer
class ManualPageBuilder(Builder):

10
sphinx/writers/manpage.py
View File

@ -10,8 +10,14 @@
"""
from docutils import nodes
from docutils.writers.manpage import MACRO_DEF, Writer, \
Translator as BaseTranslator
try:
from docutils.writers.manpage import MACRO_DEF, Writer, \
Translator as BaseTranslator
has_manpage_writer = True
except ImportError:
# define the classes in any case, sphinx.application needs it
Writer = BaseTranslator = object
has_manpage_writer = False
from sphinx import addnodes
from sphinx.locale import admonitionlabels, versionlabels, _