diff options
Diffstat (limited to 'plugins')
-rwxr-xr-x | plugins/externaldemo | 15 | ||||
-rwxr-xr-x | plugins/pythondemo | 2 | ||||
-rwxr-xr-x | plugins/rst | 16 |
3 files changed, 24 insertions, 9 deletions
diff --git a/plugins/externaldemo b/plugins/externaldemo index be7aba8b9..24861dcc9 100755 --- a/plugins/externaldemo +++ b/plugins/externaldemo @@ -8,7 +8,6 @@ use strict; print STDERR "externaldemo plugin running as pid $$\n"; use RPC::XML; -use RPC::XML::Parser; use IO::Handle; # autoflush stdout @@ -31,7 +30,19 @@ sub rpc_read { $accum=$2; # the rest # Now parse the XML RPC. - my $r = RPC::XML::Parser->new->parse($1); + my $parser; + eval q{ + use RPC::XML::ParserFactory; + $parser = RPC::XML::ParserFactory->new; + }; + if ($@) { + # old interface + eval q{ + use RPC::XML::Parser; + $parser = RPC::XML::Parser->new; + }; + } + my $r=$parser->parse($1); if (! ref $r) { die "error: XML RPC parse failure $r"; } diff --git a/plugins/pythondemo b/plugins/pythondemo index c63ce3973..911f4d7d9 100755 --- a/plugins/pythondemo +++ b/plugins/pythondemo @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- # # pythondemo — demo Python ikiwiki plugin diff --git a/plugins/rst b/plugins/rst index a2d07ebcf..838667507 100755 --- a/plugins/rst +++ b/plugins/rst @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- # # rst — xml-rpc-based ikiwiki plugin to process RST files @@ -18,18 +18,22 @@ __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 } + return 'plugin', { 'safe' : 1, 'rebuild' : 1, 'section' : 'format' } import sys def debug(s): |