1.1 --- a/parsers/xcalendar.py Sun Mar 30 20:04:32 2014 +0200
1.2 +++ b/parsers/xcalendar.py Sun Mar 30 20:32:50 2014 +0200
1.3 @@ -9,8 +9,7 @@
1.4 from MoinSupport import parseAttributes, RawParser
1.5 from EventAggregatorSupport.Formatting import formatEventsForOutputType, \
1.6 formatEvent
1.7 -from EventAggregatorSupport.Types import parseEventsInPage, EventPage, \
1.8 - parseEventsInXMLCalendar
1.9 +from EventAggregatorSupport.Types import parseEventsInXMLCalendar
1.10
1.11 Dependencies = ["pages"]
1.12
1.13 @@ -52,7 +51,7 @@
1.14 using the request.
1.15 """
1.16
1.17 - for event in parseEventsInXMLCalendar(self.raw):
1.18 + for event in parseEventsInXMLCalendar(self.raw).getEvents():
1.19 formatEvent(event, self.request, fmt, write=write, parser_cls=RawParser)
1.20
1.21 # Extra API methods.
1.22 @@ -70,7 +69,7 @@
1.23 if mimetype == "application/calendar+xml":
1.24 (write or request.write)(self.raw)
1.25 else:
1.26 - events = parseEventsInXMLCalendar(self.raw)
1.27 + events = parseEventsInXMLCalendar(self.raw).getEvents()
1.28 formatEventsForOutputType(events, self.request, mimetype, write=write)
1.29
1.30 # Class methods.