Merge remote-tracking branch 'smcv/ready/trail'

[git.ikiwiki.info.git] / plugins / pythondemo

diff --git a/plugins/pythondemo b/plugins/pythondemo
index 8ad3d5fb9a708c5f537f8b5e5f25a41d5e8c7470..5e031805be260e8409c0fa81ffdc0ec3795216e0 100755 (executable)
--- a/plugins/pythondemo
+++ b/plugins/pythondemo
@@ -1,17 +1,38 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # pythondemo — demo Python ikiwiki plugin
 #
 # Copyright © martin f. krafft <madduck@madduck.net>
-# Released under the terms of the GNU GPL version 2
-#
+# 
+#  Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# .
+# THIS SOFTWARE IS PROVIDED BY IKIWIKI AND CONTRIBUTORS ``AS IS''
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION
+# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+# 
 __name__ = 'pythondemo'
 __description__ = 'demo Python ikiwiki plugin'
 __version__ = '0.1'
 __author__ = 'martin f. krafft <madduck@madduck.net>'
 __copyright__ = 'Copyright © ' + __author__
-__licence__ = 'GPLv2'
+__licence__ = 'BSD-2-clause'
 
 from proxy import IkiWikiProcedureProxy
 
@@ -20,7 +41,7 @@ def debug(s):
     sys.stderr.write(__name__ + ':DEBUG:%s\n' % s)
     sys.stderr.flush()
 
-proxy = IkiWikiProcedureProxy(__name__, debug_fn=debug)
+proxy = IkiWikiProcedureProxy(__name__, debug_fn=None)
 
 def _arglist_to_dict(args):
     if len(args) % 2 != 0:
@@ -148,10 +169,6 @@ def scan_demo(proxy, *args):
     links = proxy.getvar('links', kwargs['page'])
     debug("links for page `%s' are: %s" % (kwargs['page'], links))
     proxy.setvar('links', kwargs['page'], links)
-    # TODO: this yields "Can't use string ("1") as an ARRAY ref while "strict
-    # refs" in use at /home/madduck/code/ikiwiki/IkiWiki/Render.pm line 17,
-    # <GEN1> line 476."
-    raise NotImplementedError
 proxy.hook('scan', scan_demo)
 
 def htmlize_demo(proxy, *args):