# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1396205045 -7200
# Node ID 73780bf1bd765af18e60cf242d128ec9c7096eb0
# Parent  d716be4aad71e2761f267fcca6b873c74583b5bd# Parent  4a378cd749464d9a573a863fd6e9718c94a56d88
Merged changes from the default branch.

diff -r d716be4aad71 -r 73780bf1bd76 parsers/calendar.py
--- a/parsers/calendar.py	Sun Mar 30 20:39:59 2014 +0200
+++ b/parsers/calendar.py	Sun Mar 30 20:44:05 2014 +0200
@@ -6,7 +6,7 @@
     @license: GNU GPL (v2 or later), see COPYING.txt for details.
 """
 
-from MoinSupport import parseAttributes, RawParser
+from MoinSupport import parseAttributes, RawParser, getPageURL
 from EventAggregatorSupport.Formatting import formatEventsForOutputType, \
                                               formatEvent
 from EventAggregatorSupport.Types import parseEventsInCalendar
@@ -51,7 +51,7 @@
         using the request.
         """
 
-        for event in parseEventsInCalendar(self.raw).getEvents():
+        for event in parseEventsInCalendar(self.raw, getPageURL(self.request.page)).getEvents():
             formatEvent(event, self.request, fmt, write=write, parser_cls=RawParser)
 
     # Extra API methods.
@@ -69,7 +69,7 @@
         if mimetype == "text/calendar":
             (write or request.write)(self.raw)
         else:
-            events = parseEventsInCalendar(self.raw).getEvents()
+            events = parseEventsInCalendar(self.raw, getPageURL(self.request.page)).getEvents()
             formatEventsForOutputType(events, self.request, mimetype, write=write)
 
     # Class methods.
diff -r d716be4aad71 -r 73780bf1bd76 parsers/xcalendar.py
--- a/parsers/xcalendar.py	Sun Mar 30 20:39:59 2014 +0200
+++ b/parsers/xcalendar.py	Sun Mar 30 20:44:05 2014 +0200
@@ -6,7 +6,7 @@
     @license: GNU GPL (v2 or later), see COPYING.txt for details.
 """
 
-from MoinSupport import parseAttributes, RawParser
+from MoinSupport import parseAttributes, RawParser, getPageURL
 from EventAggregatorSupport.Formatting import formatEventsForOutputType, \
                                               formatEvent
 from EventAggregatorSupport.Types import parseEventsInXMLCalendar
@@ -51,7 +51,7 @@
         using the request.
         """
 
-        for event in parseEventsInXMLCalendar(self.raw).getEvents():
+        for event in parseEventsInXMLCalendar(self.raw, getPageURL(self.request.page)).getEvents():
             formatEvent(event, self.request, fmt, write=write, parser_cls=RawParser)
 
     # Extra API methods.
@@ -69,7 +69,7 @@
         if mimetype == "application/calendar+xml":
             (write or request.write)(self.raw)
         else:
-            events = parseEventsInXMLCalendar(self.raw).getEvents()
+            events = parseEventsInXMLCalendar(self.raw, getPageURL(self.request.page)).getEvents()
             formatEventsForOutputType(events, self.request, mimetype, write=write)
 
     # Class methods.