# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1268786188 -3600
# Node ID 6138769c9ca221ba6b6d3f91041556e543dd6a72
# Parent  7dad8ed8b6bcabbb6f5398f047ccceeac93c69d8
Fixed empty topic list output in iCalendar resources.
Re-added Olson identifier recognition.

diff -r 7dad8ed8b6bc -r 6138769c9ca2 EventAggregatorSupport.py
--- a/EventAggregatorSupport.py	Tue Mar 16 01:06:50 2010 +0100
+++ b/EventAggregatorSupport.py	Wed Mar 17 01:36:28 2010 +0100
@@ -45,8 +45,10 @@
 month_regexp_str = ur'(?P<year>[0-9]{4})-(?P<month>[0-9]{2})'
 date_regexp_str = ur'(?P<year>[0-9]{4})-(?P<month>[0-9]{2})-(?P<day>[0-9]{2})'
 time_regexp_str = ur'(?P<hour>[0-2][0-9]):(?P<minute>[0-5][0-9])(?::(?P<second>[0-6][0-9]))?'
-timezone_offset_str = ur'(UTC)?(?:(?P<sign>[-+])(?P<hours>[0-9]{2})(?::?(?P<minutes>[0-9]{2}))?)?'
-timezone_regexp_str = ur'(?P<zone>' + timezone_offset_str + ')'
+timezone_offset_str = ur'(?P<offset>(UTC)?(?:(?P<sign>[-+])(?P<hours>[0-9]{2})(?::?(?P<minutes>[0-9]{2}))?))'
+timezone_olson_str = ur'(?P<olson>[a-zA-Z]+(?:/[-_a-zA-Z]+){1,2})'
+timezone_utc_str = ur'UTC'
+timezone_regexp_str = ur'(?P<zone>' + timezone_offset_str + '|' + timezone_olson_str + '|' + timezone_utc_str + ')'
 datetime_regexp_str = date_regexp_str + ur'(?:\s+' + time_regexp_str + ur'(?:\s+' + timezone_regexp_str + ur')?)?'
 
 month_regexp = re.compile(month_regexp_str, re.UNICODE)
diff -r 7dad8ed8b6bc -r 6138769c9ca2 actions/EventAggregatorSummary.py
--- a/actions/EventAggregatorSummary.py	Tue Mar 16 01:06:50 2010 +0100
+++ b/actions/EventAggregatorSummary.py	Wed Mar 17 01:36:28 2010 +0100
@@ -266,7 +266,7 @@
 
             # Optional details.
 
-            if event_details.has_key("topics") or event_details.has_key("categories"):
+            if event_details.get("topics") or event_details.get("categories"):
                 request.write("CATEGORIES:%s\r\n" % ",".join(
                     [getQuotedText(topic) for topic in event_details.get("topics") or event_details.get("categories")]
                     ))