1.1 --- a/EventAggregatorSupport.py Sat Feb 19 17:08:30 2011 +0100
1.2 +++ b/EventAggregatorSupport.py Sun Feb 20 22:05:23 2011 +0100
1.3 @@ -46,7 +46,7 @@
1.4 # Page parsing.
1.5
1.6 definition_list_regexp = re.compile(ur'(?P<wholeterm>^(?P<optcomment>#*)\s+(?P<term>.*?):: )(?P<desc>.*?)$', re.UNICODE | re.MULTILINE)
1.7 -category_membership_regexp = re.compile(ur"^\s*((Category\S+)(\s+Category\S+)*)\s*$", re.MULTILINE | re.UNICODE)
1.8 +category_membership_regexp = re.compile(ur"^\s*(?:(Category\S+)(?:\s+(Category\S+))*)\s*$", re.MULTILINE | re.UNICODE)
1.9
1.10 # Value parsing.
1.11
1.12 @@ -490,7 +490,7 @@
1.13 if self.categories is None:
1.14 body = self.getBody()
1.15 match = category_membership_regexp.search(body)
1.16 - self.categories = match.findall().split()
1.17 + self.categories = match and [x for x in match.groups() if x] or []
1.18
1.19 return self.categories
1.20
1.21 @@ -891,6 +891,8 @@
1.22 full_coverage.update(event_coverage)
1.23
1.24 # Add a new events list for a new location.
1.25 + # NOTE: Consider not doing this for month views, since it can lead
1.26 + # NOTE: to poor usage of space.
1.27 # Locations can be unspecified, thus None refers to all unlocalised
1.28 # events.
1.29