Changes between Version 51 and Version 52 of WikiMacros

Timestamp:

Aug 9, 2017, 9:20:03 AM (7 years ago)

Author:

Ryan J Ollos

Comment:

Use appropriate helper function.

WikiMacros

@@ -174 +174 @@
 Note that the return value of `expand_macro` is '''not''' HTML escaped. Depending on the expected result, you should escape it yourself (using `return Markup.escape(result)`) or, if this is indeed HTML, wrap it in a Markup object: `return Markup(result)` (`from trac.util.html import Markup`).
 
-You can also recursively use a wiki Formatter (`from trac.wiki import Formatter`) to process the `text` as wiki markup:
+You can also recursively use a wiki formatter to process the `text` as wiki markup:
 
 {{{#!python
-from trac.util.html import Markup
+from trac.wiki.formatter import format_to_html
 from trac.wiki.macros import WikiMacroBase
-from trac.wiki import Formatter
-import StringIO
 
 class HelloWorldMacro(WikiMacroBase):
     def expand_macro(self, formatter, name, text, args):
-        text = "whatever '''wiki''' markup you want, even containing other macros"
-        # Convert Wiki markup to HTML, new style
-        out = StringIO.StringIO()
-        Formatter(self.env, formatter.context).format(text, out)
-        return Markup(out.getvalue())
+        markup = "any '''wiki''' markup you want, even containing other macros"
+        # Convert Wiki markup to HTML
+        return format_to_html(self.env, formatter.context, markup)
+
 }}}