From: Simon McVittie <smcv@debian.org>
Date: Sat, 22 Oct 2011 18:46:02 +0000 (+0100)
Subject: rst: import docutils lazily, to avoid errors during ikiwiki --setup
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1e81affead1bf9a960daeb1990a028ac0f1810a5;p=ikiwiki.git

rst: import docutils lazily, to avoid errors during ikiwiki --setup

Bug-Debian: http://bugs.debian.org/637604
Signed-off-by: Simon McVittie <smcv@debian.org>
---

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 <madduck@madduck.net>'
 __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",