From: Ulrik Sverdrup <ulrik.sverdrup@gmail.com>
Date: Fri, 18 Sep 2009 22:17:18 +0000 (+0200)
Subject: rst: Introduce _to_dict to turn argument list into keword args
X-Git-Tag: 3.20091009~94
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=936110ddb3acf67ac950a960b5c39bfc860a17ea;p=ikiwiki.git

rst: Introduce _to_dict to turn argument list into keword args
(cherry picked from commit 7d788655104089b5747a5ff1a4c5106eac871c14)
---

diff --git a/plugins/rst b/plugins/rst
index a2d07ebcf..449dba415 100755
--- a/plugins/rst
+++ b/plugins/rst
@@ -18,16 +18,20 @@ __licence__ = 'GPLv2'
 from docutils.core import publish_parts;
 from proxy import IkiWikiProcedureProxy
 
-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',
+def rst2html(proxy, *args):
+    kwargs = _to_dict(args)
+    parts = publish_parts(kwargs["content"],
+                          writer_name="html",
                           settings_overrides = { 'halt_level': 6
                                                , 'file_insertion_enabled': 0
                                                , 'raw_enabled': 1
                                                })
     return '\n'.join(parts['html_body'].splitlines()[1:-1])
 
+def _to_dict(args):
+    # args is a list paired by key, value, so we turn it into a dict
+    return dict((k, v) for k, v in zip(*[iter(args)]*2))
+
 def getsetup(proxy, *kwargs):
     return 'plugin', { 'safe' : 1, 'rebuild' : 1 }