Changes between Version 52 and Version 53 of WikiMacros

Timestamp:

Aug 9, 2017, 9:49:30 AM (7 years ago)

Author:

Ryan J Ollos

Comment:

Use variable that agrees with documentation text.

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 to process the `text` as wiki markup:
+You can also recursively use a wiki formatter to process the `content` as wiki markup:
 
 {{{#!python
@@ -181 +181 @@
 
 class HelloWorldMacro(WikiMacroBase):
-    def expand_macro(self, formatter, name, text, args):
-        markup = "any '''wiki''' markup you want, even containing other macros"
+    def expand_macro(self, formatter, name, content, args):
+        content = "any '''wiki''' markup you want, even containing other macros"
         # Convert Wiki markup to HTML
-        return format_to_html(self.env, formatter.context, markup)
-
+        return format_to_html(self.env, formatter.context, content)
 }}}