From 1e81affead1bf9a960daeb1990a028ac0f1810a5 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 22 Oct 2011 19:46:02 +0100 Subject: [PATCH] rst: import docutils lazily, to avoid errors during ikiwiki --setup Bug-Debian: http://bugs.debian.org/637604 Signed-off-by: Simon McVittie --- plugins/rst | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/plugins/rst b/plugins/rst index fb36245de..0fe91c58b 100755 --- a/plugins/rst +++ b/plugins/rst @@ -36,10 +36,22 @@ __author__ = 'martin f. krafft ' __copyright__ = 'Copyright © ' + __author__ __licence__ = 'BSD-2-clause' -from docutils.core import publish_parts; from proxy import IkiWikiProcedureProxy +publish_parts = None + def rst2html(proxy, *args): + # delayed import so docutils is only needed if you *use* rst - + # http://bugs.debian.org/637604 + global publish_parts + if publish_parts is None: + try: + from docutils.core import publish_parts + except ImportError, e: + proxy.error('cannot import docutils.core: %s: %s' % + (e.__class__.__name__, e)) + raise + kwargs = _to_dict(args) parts = publish_parts(kwargs["content"], writer_name="html", -- 2.44.0