From b6d02fa97974af66dc4d2f6ed0bad77f5a8d2605 Mon Sep 17 00:00:00 2001 From: Iustin Pop <iustin@google.com> Date: Fri, 19 Aug 2011 16:48:26 +0200 Subject: [PATCH] sphinx_ext: workaround epydoc warning Similar to commit c29e35f, this works around epydoc breakage by aliasing the module. Makes 'apidoc' pass again on my machine. Signed-off-by: Iustin Pop <iustin@google.com> Reviewed-by: Michael Hanselmann <hansmi@google.com> --- lib/build/sphinx_ext.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/build/sphinx_ext.py b/lib/build/sphinx_ext.py index 2abfe6e0d..474721dcc 100644 --- a/lib/build/sphinx_ext.py +++ b/lib/build/sphinx_ext.py @@ -32,6 +32,8 @@ import docutils.utils import sphinx.errors import sphinx.util.compat +s_compat = sphinx.util.compat + from ganeti import constants from ganeti import compat from ganeti import errors @@ -147,7 +149,7 @@ def _BuildOpcodeResult(op_id): return "``%s``" % result_fn -class OpcodeParams(sphinx.util.compat.Directive): +class OpcodeParams(s_compat.Directive): """Custom directive for opcode parameters. See also <http://docutils.sourceforge.net/docs/howto/rst-directives.html>. @@ -178,7 +180,7 @@ class OpcodeParams(sphinx.util.compat.Directive): return [] -class OpcodeResult(sphinx.util.compat.Directive): +class OpcodeResult(s_compat.Directive): """Custom directive for opcode result. See also <http://docutils.sourceforge.net/docs/howto/rst-directives.html>. @@ -230,7 +232,7 @@ def PythonEvalRole(role, rawtext, text, lineno, inliner, return ([node], []) -class PythonAssert(sphinx.util.compat.Directive): +class PythonAssert(s_compat.Directive): """Custom directive for writing assertions. The content must be a valid Python expression. If its result does not -- GitLab