aboutsummaryrefslogtreecommitdiff
path: root/plugins/rst
diff options
context:
space:
mode:
authorW. Trevor King <wking@tremily.us>2012-09-28 02:16:29 -0400
committerW. Trevor King <wking@tremily.us>2012-09-28 02:16:29 -0400
commit792816e01d785e18b5e7a043def48ec57251b45f (patch)
tree58664c2e869e974a7a600fc3ccb159b0f104dab7 /plugins/rst
parent82fddabcec2caabab6a6be96f4c0a6edb5ee6253 (diff)
downloadikiwiki-792816e01d785e18b5e7a043def48ec57251b45f.tar
ikiwiki-792816e01d785e18b5e7a043def48ec57251b45f.tar.gz
rst: update string formatting and error catching syntax
Diffstat (limited to 'plugins/rst')
-rwxr-xr-xplugins/rst15
1 files changed, 9 insertions, 6 deletions
diff --git a/plugins/rst b/plugins/rst
index 4d79c1796..779a87fa3 100755
--- a/plugins/rst
+++ b/plugins/rst
@@ -40,10 +40,14 @@ __author__ = 'martin f. krafft <madduck@madduck.net>'
__copyright__ = 'Copyright © ' + __author__
__licence__ = 'BSD-2-clause'
+import sys as _sys
+
from proxy import IkiWikiProcedureProxy
+
publish_parts = None
+
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
- 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: {}: {}'.format(
+ e.__class__.__name__, e))
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' }
-import sys
def debug(s):
- sys.stderr.write(__name__ + ':DEBUG:%s\n' % s)
- sys.stderr.flush()
+ _sys.stderr.write(__name__ + ':DEBUG:{}\n'.format(s))
+ _sys.stderr.flush()
proxy = IkiWikiProcedureProxy(__name__, debug_fn=None)
proxy.hook('getsetup', getsetup)