Revision dac59ac5
| b/lib/build/sphinx_ext.py | ||
|---|---|---|
| 26 | 26 |
import operator |
| 27 | 27 |
from cStringIO import StringIO |
| 28 | 28 |
|
| 29 |
from docutils import statemachine
|
|
| 29 |
import docutils.statemachine
|
|
| 30 | 30 |
|
| 31 |
from sphinx.errors import SphinxError
|
|
| 32 |
from sphinx.util.compat import Directive
|
|
| 31 |
import sphinx.errors
|
|
| 32 |
import sphinx.util.compat
|
|
| 33 | 33 |
|
| 34 | 34 |
from ganeti import utils |
| 35 | 35 |
from ganeti import opcodes |
| ... | ... | |
| 39 | 39 |
COMMON_PARAM_NAMES = map(operator.itemgetter(0), opcodes.OpCode.OP_PARAMS) |
| 40 | 40 |
|
| 41 | 41 |
|
| 42 |
class OpcodeError(SphinxError): |
|
| 42 |
class OpcodeError(sphinx.errors.SphinxError):
|
|
| 43 | 43 |
category = "Opcode error" |
| 44 | 44 |
|
| 45 | 45 |
|
| ... | ... | |
| 119 | 119 |
yield " %s" % line |
| 120 | 120 |
|
| 121 | 121 |
|
| 122 |
class OpcodeParams(Directive): |
|
| 122 |
class OpcodeParams(sphinx.util.compat.Directive):
|
|
| 123 | 123 |
"""Custom directive for opcode parameters. |
| 124 | 124 |
|
| 125 | 125 |
See also <http://docutils.sourceforge.net/docs/howto/rst-directives.html>. |
| ... | ... | |
| 143 | 143 |
include_text = "\n".join(_BuildOpcodeParams(op_id, include, exclude, alias)) |
| 144 | 144 |
|
| 145 | 145 |
# Inject into state machine |
| 146 |
include_lines = statemachine.string2lines(include_text, tab_width, |
|
| 147 |
convert_whitespace=1) |
|
| 146 |
include_lines = docutils.statemachine.string2lines(include_text, tab_width,
|
|
| 147 |
convert_whitespace=1)
|
|
| 148 | 148 |
self.state_machine.insert_input(include_lines, path) |
| 149 | 149 |
|
| 150 | 150 |
return [] |
Also available in: Unified diff