# HG changeset patch # User Paul Boddie # Date 1371256162 -7200 # Node ID 27e89b1bcc3dd17760909a4afac488fe82355525 # Parent 9f28df3c3edfb0628b85235006999fae2f9d1b8c Made use of the extended parser API for output formatting. diff -r 9f28df3c3edf -r 27e89b1bcc3d macros/SharedContent.py --- a/macros/SharedContent.py Sat Jun 15 00:45:10 2013 +0200 +++ b/macros/SharedContent.py Sat Jun 15 02:29:22 2013 +0200 @@ -9,7 +9,8 @@ from DateSupport import getDateTimeFromISO8601, DateTime from MoinMoin.Page import Page from MoinRemoteSupport import * -from MoinSupport import parseMacroArguments, getParsersForContentType, formatText +from MoinSupport import parseMacroArguments, getParsersForContentType, \ + formatText, formatTextForOutputType from MoinShare import getUpdateSources, getUpdatesFromPage, \ getUpdatesFromStore, getUpdateFromPart, \ Update, get_make_parser @@ -243,7 +244,10 @@ if parsers: for parser_cls in parsers: - return formatText(update.content, request, fmt, parser_cls=parser_cls) + if hasattr(parser_cls, "formatForOutputType"): + return formatTextForOutputType(update.content, request, parser_cls, "text/html") + else: + return formatText(update.content, request, fmt, parser_cls=parser_cls) break else: return None