Skip to content

Commit

Permalink
rst: import docutils lazily, to avoid errors during ikiwiki --setup
Browse files Browse the repository at this point in the history
Bug-Debian: http://bugs.debian.org/637604
Signed-off-by: Simon McVittie <smcv@debian.org>
  • Loading branch information
smcv committed Oct 22, 2011
1 parent 0bc682c commit 1e81aff
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion plugins/rst
Expand Up @@ -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",
Expand Down

0 comments on commit 1e81aff

Please sign in to comment.