Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bit of unapologetic fingerpointing
[git.ikiwiki.info.git]
/
plugins
/
rst
diff --git
a/plugins/rst
b/plugins/rst
index 236ff1071de119395ba9eebccd02d13c462ac2ac..ba0f543f9244a04a10bc8b35b926cc0f30743e19 100755
(executable)
--- a/
plugins/rst
+++ b/
plugins/rst
@@
-10,7
+10,7
@@
# 2009 Ulrik Sverdrup <ulrik.sverdrup@gmail.com>
# 2011 Simon McVittie <smcv@debian.org>
# 2012 W. Trevor King <wking@tremily.us>
# 2009 Ulrik Sverdrup <ulrik.sverdrup@gmail.com>
# 2011 Simon McVittie <smcv@debian.org>
# 2012 W. Trevor King <wking@tremily.us>
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
@@
-32,18
+32,22
@@
# 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.
# 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__ = 'rst'
__description__ = 'xml-rpc-based ikiwiki plugin to process RST files'
__name__ = 'rst'
__description__ = 'xml-rpc-based ikiwiki plugin to process RST files'
-__version__ = '0.
3
'
+__version__ = '0.
4
'
__author__ = 'martin f. krafft <madduck@madduck.net>'
__copyright__ = 'Copyright © ' + __author__
__licence__ = 'BSD-2-clause'
__author__ = 'martin f. krafft <madduck@madduck.net>'
__copyright__ = 'Copyright © ' + __author__
__licence__ = 'BSD-2-clause'
+import sys as _sys
+
from proxy import IkiWikiProcedureProxy
from proxy import IkiWikiProcedureProxy
+
publish_parts = None
publish_parts = None
+
def rst2html(proxy, *args):
# delayed import so docutils is only needed if you *use* rst -
# http://bugs.debian.org/637604
def rst2html(proxy, *args):
# delayed import so docutils is only needed if you *use* rst -
# http://bugs.debian.org/637604
@@
-51,9
+55,9
@@
def rst2html(proxy, *args):
if publish_parts is None:
try:
from docutils.core import 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))
+ except ImportError
as
e:
+ proxy.error('cannot import docutils.core:
{0}: {1}'.format(
+ e.__class__.__name__, e))
raise
kwargs = _to_dict(args)
raise
kwargs = _to_dict(args)
@@
-72,10
+76,9
@@
def _to_dict(args):
def getsetup(proxy, *kwargs):
return 'plugin', { 'safe' : 1, 'rebuild' : 1, 'section' : 'format' }
def getsetup(proxy, *kwargs):
return 'plugin', { 'safe' : 1, 'rebuild' : 1, 'section' : 'format' }
-import sys
def debug(s):
def debug(s):
-
sys.stderr.write(__name__ + ':DEBUG:%s\n' % s
)
- sys.stderr.flush()
+
_sys.stderr.write(__name__ + ':DEBUG:{0}\n'.format(s)
)
+
_
sys.stderr.flush()
proxy = IkiWikiProcedureProxy(__name__, debug_fn=None)
proxy.hook('getsetup', getsetup)
proxy = IkiWikiProcedureProxy(__name__, debug_fn=None)
proxy.hook('getsetup', getsetup)