# HG changeset patch # User Paul Boddie # Date 1371256041 -7200 # Node ID 8f794f5f0ba17e181acb55c030ccc9bd5cde7373 # Parent b2931587316ffcbc0e03d18b47ef61898ed847e2 Fixed conversion to text in event output. Provided a sensible raw details default for events. Fixed imports in the parser. diff -r b2931587316f -r 8f794f5f0ba1 EventAggregatorSupport/Formatting.py --- a/EventAggregatorSupport/Formatting.py Fri Jun 14 17:24:37 2013 +0200 +++ b/EventAggregatorSupport/Formatting.py Sat Jun 15 02:27:21 2013 +0200 @@ -69,7 +69,7 @@ if term in event.list_terms: write(", ".join([formatText(str(v), request, fmt) for v in value])) else: - write(fmt.text(str(value))) + write(fmt.text(unicode(value))) write(fmt.definition_desc(on=0)) diff -r b2931587316f -r 8f794f5f0ba1 EventAggregatorSupport/Types.py --- a/EventAggregatorSupport/Types.py Fri Jun 14 17:24:37 2013 +0200 +++ b/EventAggregatorSupport/Types.py Sat Jun 15 02:27:21 2013 +0200 @@ -543,7 +543,7 @@ def __init__(self, page, details, raw_details=None): self.page = page self.details = details - self.raw_details = raw_details + self.raw_details = raw_details or {} # Permit omission of the end of the event by duplicating the start. diff -r b2931587316f -r 8f794f5f0ba1 parsers/event.py --- a/parsers/event.py Fri Jun 14 17:24:37 2013 +0200 +++ b/parsers/event.py Sat Jun 15 02:27:21 2013 +0200 @@ -2,11 +2,13 @@ """ MoinMoin - event (EventAggregator) - @copyright: 2012 by Paul Boddie + @copyright: 2012, 2013 by Paul Boddie @license: GNU GPL (v2 or later), see COPYING.txt for details. """ -from EventAggregatorSupport import * +from MoinSupport import parseAttributes +from EventAggregatorSupport.Formatting import formatEvent, formatEventsForOutputType +from EventAggregatorSupport.Types import parseEvents Dependencies = ["pages"]