From c6793656f78005c4306d5d5c4a0699d852fb16d5 Mon Sep 17 00:00:00 2001 From: Michael Hanselmann <hansmi@google.com> Date: Thu, 14 Feb 2013 16:17:52 +0100 Subject: [PATCH] Sphinx extension: Module-level constant for tab width Use a module-level constant for the tab width. Signed-off-by: Michael Hanselmann <hansmi@google.com> Reviewed-by: Michele Tartara <mtartara@google.com> --- lib/build/sphinx_ext.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/build/sphinx_ext.py b/lib/build/sphinx_ext.py index 30e733e3b..092e3cf7f 100644 --- a/lib/build/sphinx_ext.py +++ b/lib/build/sphinx_ext.py @@ -63,6 +63,8 @@ import ganeti.rapi.rlib2 # pylint: disable=W0611 #: Regular expression for man page names _MAN_RE = re.compile(r"^(?P<name>[-\w_]+)\((?P<section>\d+)\)$") +_TAB_WIDTH = 2 + class ReSTError(Exception): """Custom class for generating errors in Sphinx. @@ -214,12 +216,11 @@ class OpcodeParams(s_compat.Directive): exclude = self.options.get("exclude", None) alias = self.options.get("alias", {}) - tab_width = 2 path = op_id include_text = "\n".join(_BuildOpcodeParams(op_id, include, exclude, alias)) # Inject into state machine - include_lines = docutils.statemachine.string2lines(include_text, tab_width, + include_lines = docutils.statemachine.string2lines(include_text, _TAB_WIDTH, convert_whitespace=1) self.state_machine.insert_input(include_lines, path) @@ -240,12 +241,11 @@ class OpcodeResult(s_compat.Directive): def run(self): op_id = self.arguments[0] - tab_width = 2 path = op_id include_text = _BuildOpcodeResult(op_id) # Inject into state machine - include_lines = docutils.statemachine.string2lines(include_text, tab_width, + include_lines = docutils.statemachine.string2lines(include_text, _TAB_WIDTH, convert_whitespace=1) self.state_machine.insert_input(include_lines, path) -- GitLab