Changes between Version 5 and Version 6 of WikiMacros

Timestamp:

Sep 21, 2017, 3:39:12 PM (7 years ago)

Author:

trac

Comment:

--

WikiMacros

@@ -95 +95 @@
 # Note: since Trac 0.11, datetime objects are used internally
 
-from genshi.builder import tag
-
 from trac.util.datefmt import format_datetime, utc
+from trac.util.html import tag
 from trac.wiki.macros import WikiMacroBase
 
@@ -116 +115 @@
 
 {{{#!python
-from genshi.core import Markup
-
+from trac.util.html import Markup
 from trac.wiki.macros import WikiMacroBase
 
@@ -173 +171 @@
 }}}
 
-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)`) with `Markup` coming from Genshi (`from genshi.core import Markup`).
+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:
 
 {{{#!python
-from genshi.core import Markup
+from trac.util.html import Markup
 from trac.wiki.macros import WikiMacroBase
 from trac.wiki import Formatter