1.1 --- a/parsers/event.py Wed Jul 11 00:46:55 2012 +0200
1.2 +++ b/parsers/event.py Sun Jul 15 21:28:37 2012 +0200
1.3 @@ -34,23 +34,31 @@
1.4 self.request = request
1.5 #self.attrs = parseAttributes(kw.get("format_args", ""), False)
1.6
1.7 - def format(self, fmt):
1.8 + def format(self, fmt, write=None):
1.9
1.10 - "Format an event using the given formatter 'fmt'."
1.11 + """
1.12 + Format an event using the given formatter 'fmt'. If the 'write'
1.13 + parameter is specified, use it to write output; otherwise, write output
1.14 + using the request.
1.15 + """
1.16
1.17 - events = parseEvents(self.raw, self.request.page)
1.18 + events = parseEvents(self.raw, EventPage(self.request.page))
1.19
1.20 for event in events:
1.21 - formatEvent(event, self.request, fmt)
1.22 + formatEvent(event, self.request, fmt, write=write)
1.23
1.24 # Extra API methods.
1.25
1.26 - def formatText(self, text, mimetype):
1.27 + def formatForOutputType(self, mimetype, write=None):
1.28
1.29 - "Format the event 'text' for the given 'mimetype'."
1.30 + """
1.31 + Format an event for the given 'mimetype'. If the 'write' parameter is
1.32 + specified, use it to write output; otherwise, write output using the
1.33 + request.
1.34 + """
1.35
1.36 - events = parseEvents(text)
1.37 - formatEventsForOutputType(events, self.request, mimetype)
1.38 + events = parseEvents(self.raw, EventPage(self.request.page))
1.39 + formatEventsForOutputType(events, self.request, mimetype, write=write)
1.40
1.41 # Class methods.
1.42