1.1 --- a/parsers/calendar.py Sun Apr 06 23:35:52 2014 +0200
1.2 +++ b/parsers/calendar.py Mon Apr 07 23:16:49 2014 +0200
1.3 @@ -8,7 +8,7 @@
1.4
1.5 from MoinSupport import parseAttributes, RawParser, getPageURL
1.6 from EventAggregatorSupport.Formatting import formatEventsForOutputType, \
1.7 - formatEvent
1.8 + formatEvent, formatMethod
1.9 from EventAggregatorSupport.Types import parseEventsInCalendar
1.10
1.11 Dependencies = ["pages"]
1.12 @@ -51,9 +51,13 @@
1.13 using the request.
1.14 """
1.15
1.16 - for event in parseEventsInCalendar(self.raw, getPageURL(self.request.page)).getEvents():
1.17 + resource = parseEventsInCalendar(self.raw, getPageURL(self.request.page))
1.18 +
1.19 + for event in resource.getEvents():
1.20 formatEvent(event, self.request, fmt, write=write, parser_cls=RawParser)
1.21
1.22 + formatMethod(resource, self.request, fmt, write)
1.23 +
1.24 # Extra API methods.
1.25
1.26 def formatForOutputType(self, mimetype, write=None):
1.27 @@ -69,8 +73,9 @@
1.28 if mimetype == "text/calendar":
1.29 (write or request.write)(self.raw)
1.30 else:
1.31 - events = parseEventsInCalendar(self.raw, getPageURL(self.request.page)).getEvents()
1.32 - formatEventsForOutputType(events, self.request, mimetype, write=write)
1.33 + resource = parseEventsInCalendar(self.raw, getPageURL(self.request.page))
1.34 + events = resource.getEvents()
1.35 + formatEventsForOutputType(events, self.request, mimetype, write=write, resource=resource)
1.36
1.37 # Class methods.
1.38