1.1 --- a/parsers/event.py Tue Jan 14 16:39:26 2014 +0100
1.2 +++ b/parsers/event.py Tue Jan 14 23:55:27 2014 +0100
1.3 @@ -8,7 +8,7 @@
1.4
1.5 from MoinSupport import parseAttributes
1.6 from EventAggregatorSupport.Formatting import formatEvent, formatEventsForOutputType
1.7 -from EventAggregatorSupport.Types import parseEvents, EventPage
1.8 +from EventAggregatorSupport.Types import parseEventsInPage, EventPage
1.9
1.10 Dependencies = ["pages"]
1.11
1.12 @@ -46,9 +46,7 @@
1.13 using the request.
1.14 """
1.15
1.16 - events = parseEvents(self.raw, EventPage(self.request.page), self.fragment)
1.17 -
1.18 - for event in events:
1.19 + for event in parseEventsInPage(self.raw, EventPage(self.request.page), self.fragment):
1.20 formatEvent(event, self.request, fmt, write=write)
1.21
1.22 # Extra API methods.
1.23 @@ -61,7 +59,7 @@
1.24 request.
1.25 """
1.26
1.27 - events = parseEvents(self.raw, EventPage(self.request.page), self.fragment)
1.28 + events = parseEventsInPage(self.raw, EventPage(self.request.page), self.fragment)
1.29 formatEventsForOutputType(events, self.request, mimetype, write=write)
1.30
1.31 # Class methods.