1.1 --- a/EventAggregatorSupport.py Wed Feb 24 02:06:36 2010 +0100
1.2 +++ b/EventAggregatorSupport.py Thu Feb 25 01:02:38 2010 +0100
1.3 @@ -35,7 +35,7 @@
1.4
1.5 # Page parsing.
1.6
1.7 -definition_list_regexp = re.compile(ur'(?P<wholeterm>^(?P<optcomment>#*)\s+(?P<term>.*?)::\s)(?P<desc>.*?)$', re.UNICODE | re.MULTILINE)
1.8 +definition_list_regexp = re.compile(ur'(?P<wholeterm>^(?P<optcomment>#*)\s+(?P<term>.*?):: )(?P<desc>.*?)$', re.UNICODE | re.MULTILINE)
1.9 category_membership_regexp = re.compile(ur"^\s*((Category\S+)(\s+Category\S+)*)\s*$", re.MULTILINE | re.UNICODE)
1.10
1.11 # Value parsing.
1.12 @@ -288,7 +288,7 @@
1.13 # Lists (whose elements may be quoted).
1.14
1.15 elif term in ("topics", "categories"):
1.16 - desc = [getSimpleWikiText(value.strip()) for value in desc.split(",")]
1.17 + desc = [getSimpleWikiText(value.strip()) for value in desc.split(",") if value.strip()]
1.18
1.19 # Labels which may well be quoted.
1.20
2.1 --- a/README.txt Wed Feb 24 02:06:36 2010 +0100
2.2 +++ b/README.txt Thu Feb 25 01:02:38 2010 +0100
2.3 @@ -174,6 +174,10 @@
2.4
2.5 * Added print stylesheet rules in order to improve the printed versions of
2.6 calendars.
2.7 + * Fixed definition list parsing to handle completely empty definitions
2.8 + (having no space after the "::" token) which previously captured text from
2.9 + subsequent lines, and merely empty definitions which previously would have
2.10 + produced a single empty value for definitions providing lists of values.
2.11
2.12 New in EventAggregator 0.5 (Changes since EventAggregator 0.4)
2.13 --------------------------------------------------------------