1.1 --- a/.hgtags Sun Aug 07 14:51:46 2011 +0200
1.2 +++ b/.hgtags Wed Aug 10 00:59:02 2011 +0200
1.3 @@ -9,3 +9,4 @@
1.4 067b30223eb3db64971ace7dae263e4eae09dce6 rel-0-6-1
1.5 d9899cbca14d468b65a8c3025c3f3542211f8271 rel-0-6-2
1.6 2125a3ee359102989f5d379cfe71e3fa80f9a61b rel-0-7
1.7 +7bfc4c8339c22fa25dd5e84f71d8c5b3712b883f rel-0-7-1
2.1 --- a/EventAggregatorSupport.py Sun Aug 07 14:51:46 2011 +0200
2.2 +++ b/EventAggregatorSupport.py Wed Aug 10 00:59:02 2011 +0200
2.3 @@ -44,7 +44,7 @@
2.4
2.5 escape = wikiutil.escape
2.6
2.7 -__version__ = "0.7"
2.8 +__version__ = "0.7.1"
2.9
2.10 # Date labels.
2.11
2.12 @@ -135,6 +135,15 @@
2.13 category_regexp = re.compile(u'^%s$' % ur'(?P<all>Category(?P<key>(?!Template)\S+))', re.UNICODE)
2.14 return category_regexp
2.15
2.16 +def getWikiDict(pagename, request):
2.17 + if Page(request, pagename).exists() and request.user.may.read(pagename):
2.18 + if hasattr(request.dicts, "dict"):
2.19 + return request.dicts.dict(pagename)
2.20 + else:
2.21 + return request.dicts[pagename]
2.22 + else:
2.23 + return None
2.24 +
2.25 def getContentEncoding(content_type):
2.26 m = encoding_regexp.search(content_type)
2.27 if m:
3.1 --- a/PKG-INFO Sun Aug 07 14:51:46 2011 +0200
3.2 +++ b/PKG-INFO Wed Aug 10 00:59:02 2011 +0200
3.3 @@ -1,12 +1,12 @@
3.4 Metadata-Version: 1.1
3.5 Name: EventAggregator
3.6 -Version: 0.7
3.7 +Version: 0.7.1
3.8 Author: Paul Boddie
3.9 Author-email: paul at boddie org uk
3.10 Maintainer: Paul Boddie
3.11 Maintainer-email: paul at boddie org uk
3.12 Home-page: http://moinmo.in/MacroMarket/EventAggregator
3.13 -Download-url: http://moinmo.in/MacroMarket/EventAggregator?action=AttachFile&do=view&target=EventAggregator-0.7.tar.gz
3.14 +Download-url: http://moinmo.in/MacroMarket/EventAggregator?action=AttachFile&do=view&target=EventAggregator-0.7.1.tar.gz
3.15 Summary: Aggregate event data and display it in an event calendar (or summarise it in iCalendar and RSS resources)
3.16 License: GPL (version 2 or later)
3.17 Description: The EventAggregator macro for MoinMoin can be used to display event
4.1 --- a/README.txt Sun Aug 07 14:51:46 2011 +0200
4.2 +++ b/README.txt Wed Aug 10 00:59:02 2011 +0200
4.3 @@ -26,6 +26,9 @@
4.4 Important Notices
4.5 -----------------
4.6
4.7 +Release 0.7.1 restores MoinMoin 1.9.x compatibility which was accidentally
4.8 +lost in the 0.7 release.
4.9 +
4.10 Release 0.6.2 fixes various bugs in HTML production done by the actions. It is
4.11 strongly recommended to upgrade from earlier versions to this or a later
4.12 release.
4.13 @@ -252,13 +255,18 @@
4.14 time zone information for the correct interpretation of time information in
4.15 those summaries. Thus, it is highly recommended that pytz be installed.
4.16
4.17 -New in EventAggregator 0.8 (Changes since EventAggregator 0.7)
4.18 ---------------------------------------------------------------
4.19 +New in EventAggregator 0.8 (Changes since EventAggregator 0.7.1)
4.20 +----------------------------------------------------------------
4.21
4.22 * Added remote event aggregation with support for iCalendar event sources.
4.23 * Added support for explicit latitude and longitude event properties.
4.24 * Added support for decimal latitude and longitude values.
4.25
4.26 +New in EventAggregator 0.7.1 (Changes since EventAggregator 0.7)
4.27 +----------------------------------------------------------------
4.28 +
4.29 + * Restored MoinMoin 1.9.x compatibility around WikiDict access.
4.30 +
4.31 New in EventAggregator 0.7 (Changes since EventAggregator 0.6.4)
4.32 ----------------------------------------------------------------
4.33
5.1 --- a/macros/EventAggregator.py Sun Aug 07 14:51:46 2011 +0200
5.2 +++ b/macros/EventAggregator.py Wed Aug 10 00:59:02 2011 +0200
5.3 @@ -1518,15 +1518,8 @@
5.4
5.5 # Get the maps and locations.
5.6
5.7 - if request.user.may.read(maps_page):
5.8 - maps = request.dicts.dict(maps_page)
5.9 - else:
5.10 - maps = None
5.11 -
5.12 - if request.user.may.read(locations_page):
5.13 - locations = request.dicts.dict(locations_page)
5.14 - else:
5.15 - locations = None
5.16 + maps = getWikiDict(maps_page, request)
5.17 + locations = getWikiDict(locations_page, request)
5.18
5.19 # Get the map image definition.
5.20
6.1 --- a/setup.py Sun Aug 07 14:51:46 2011 +0200
6.2 +++ b/setup.py Wed Aug 10 00:59:02 2011 +0200
6.3 @@ -8,6 +8,6 @@
6.4 author = "Paul Boddie",
6.5 author_email = "paul@boddie.org.uk",
6.6 url = "http://moinmo.in/MacroMarket/EventAggregator",
6.7 - version = "0.7",
6.8 + version = "0.7.1",
6.9 py_modules = ["EventAggregatorSupport", "MoinMoin.script.import.eventfeed"]
6.10 )