Merge branch 'master' into tova

[ikiwiki.git] / plugins / rst

diff --git a/plugins/rst b/plugins/rst
index c1f07e4cdb845b100ea8e2a781e8bec516cddb95..350b76dfa4c7a06aae2b0b75b6758111fae61d8b 100755 (executable)
--- a/plugins/rst
+++ b/plugins/rst
@@ -3,9 +3,6 @@
 #
 # rst — xml-rpc-based ikiwiki plugin to process RST files
 #
-# TODO: the top of this file should be converted to a python library for
-# ikiwiki plugins
-# 
 # based a little bit on rst.pm by Sergio Talens-Oliag, but only a little bit. :)
 #
 # Copyright © martin f. krafft <madduck@madduck.net>
@@ -21,7 +18,7 @@ __licence__ = 'GPLv2'
 from docutils.core import publish_parts;
 from proxy import IkiWikiProcedureProxy
 
-def rst2html(*kwargs):
+def rst2html(proxy, *kwargs):
     # FIXME arguments should be treated as a hash, the order could change
     # at any time and break this.
     parts = publish_parts(kwargs[3], writer_name='html',
@@ -33,9 +30,9 @@ def rst2html(*kwargs):
 
 import sys
 def debug(s):
-    sys.stderr.write(__name__ + ':DEBUG:%s' % s)
+    sys.stderr.write(__name__ + ':DEBUG:%s\n' % s)
     sys.stderr.flush()
 
 proxy = IkiWikiProcedureProxy(__name__, debug_fn=None)
-proxy.register_hook('htmlize', rst2html)
+proxy.hook('htmlize', rst2html)
 proxy.run()