# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1281280079 -7200
# Node ID f58f23315d69ba19c96a309e1ca92bad0be4889a
# Parent  04d2cd8f3d0185311c4894928b1087111b7d0b86
Removed MoinMoin 1.5.x support.

diff -r 04d2cd8f3d01 -r f58f23315d69 EventAggregatorSupport.py
--- a/EventAggregatorSupport.py	Wed Aug 04 00:06:36 2010 +0200
+++ b/EventAggregatorSupport.py	Sun Aug 08 17:07:59 2010 +0200
@@ -75,9 +75,6 @@
 
 # Utility functions.
 
-def isMoin15():
-    return version.release.startswith("1.5.")
-
 def getCategoryPattern(request):
     global category_regexp
 
@@ -342,11 +339,7 @@
     """
 
     query = search.QueryParser().parse_query('category:%s' % pagename)
-    if isMoin15():
-        results = search.searchPages(request, query)
-        results.sortByPagename()
-    else:
-        results = search.searchPages(request, query, "page_name")
+    results = search.searchPages(request, query, "page_name")
 
     cat_pattern = getCategoryPattern(request)
     pages = []
@@ -377,21 +370,13 @@
 
         "Using 'request', return the URL of this page."
 
-        page = self.page
-
-        if isMoin15():
-            return request.getQualifiedURL(page.url(request))
-        else:
-            return request.getQualifiedURL(page.url(request, relative=0))
+        return request.getQualifiedURL(self.page.url(request, relative=0))
 
     def getFormat(self):
 
         "Get the format used on this page."
 
-        if isMoin15():
-            return "wiki" # page.pi_format
-        else:
-            return self.page.pi["format"]
+        return self.page.pi["format"]
 
     def getRevisions(self):
 
@@ -1479,11 +1464,7 @@
 
     "Return a nicely formatted title/name for the given 'page'."
 
-    if isMoin15():
-        title = page.split_title(page.request, force=1)
-    else:
-        title = page.split_title(force=1)
-
+    title = page.split_title(force=1)
     return getPrettyTitle(title)
 
 def linkToPage(request, page, text, query_string=None):
@@ -1494,14 +1475,7 @@
     """
 
     text = wikiutil.escape(text)
-
-    if isMoin15():
-        url = wikiutil.quoteWikinameURL(page.page_name)
-        if query_string is not None:
-            url = "%s?%s" % (url, query_string)
-        return wikiutil.link_tag(request, url, text, getattr(page, "formatter", None))
-    else:
-        return page.link_to_raw(request, text, query_string)
+    return page.link_to_raw(request, text, query_string)
 
 def getFullPageName(parent, title):
 
diff -r 04d2cd8f3d01 -r f58f23315d69 PKG-INFO
--- a/PKG-INFO	Wed Aug 04 00:06:36 2010 +0200
+++ b/PKG-INFO	Sun Aug 08 17:07:59 2010 +0200
@@ -6,7 +6,7 @@
 Maintainer: Paul Boddie
 Maintainer-email: paul at boddie org uk
 Home-page: http://moinmo.in/MacroMarket/EventAggregator
-Download-url: http://moinmo.in/MacroMarket/EventAggregator?action=AttachFile&do=view&target=EventAggregator-0.6.tar.gz
+Download-url: http://moinmo.in/MacroMarket/EventAggregator?action=AttachFile&do=view&target=EventAggregator-0.7.tar.gz
 Summary: Aggregate event data and display it in an event calendar (or summarise it in iCalendar and RSS resources)
 License: GPL (version 2 or later)
 Description: The EventAggregator macro for MoinMoin can be used to display event
diff -r 04d2cd8f3d01 -r f58f23315d69 README.txt
--- a/README.txt	Wed Aug 04 00:06:36 2010 +0200
+++ b/README.txt	Sun Aug 08 17:07:59 2010 +0200
@@ -26,6 +26,11 @@
 Important Notices
 -----------------
 
+In release 0.7, support for MoinMoin 1.5.x has been dropped. Since usage of
+the Xapian search software is practically a necessary part of deploying this
+solution, and yet Xapian only became integrated with MoinMoin from version 1.6
+onwards, few deployments should have involved MoinMoin 1.5.x.
+
 In release 0.6, support for event times has been introduced. Due to the
 complicated nature of times, time zones, time regimes, and so on, the
 behaviour of the software may change in future versions to support common
@@ -109,12 +114,7 @@
 Using the Macro
 ---------------
 
-It should now be possible to edit pages and use the macro as follows. For
-MoinMoin 1.5:
-
-  [[EventAggregator(CategoryEvents)]]
-
-For MoinMoin 1.6 and above:
+It should now be possible to edit pages and use the macro as follows:
 
   <<EventAggregator(CategoryEvents)>>
 
@@ -227,6 +227,8 @@
 New in EventAggregator 0.7 (Changes since EventAggregator 0.6)
 --------------------------------------------------------------
 
+  * Dropped MoinMoin 1.5.x support, since Xapian search is not available for
+    that version and is virtually a necessity.
   * Fixed form handling to be compatible with MoinMoin 1.9.x, since that
     particular release series introduced an incompatible request API that
     breaks existing code (no longer providing access to query string
diff -r 04d2cd8f3d01 -r f58f23315d69 actions/EventAggregatorSummary.py
--- a/actions/EventAggregatorSummary.py	Wed Aug 04 00:06:36 2010 +0200
+++ b/actions/EventAggregatorSummary.py	Sun Aug 08 17:07:59 2010 +0200
@@ -14,7 +14,6 @@
 from MoinMoin.action import ActionBase
 from MoinMoin import config
 from MoinMoin.Page import Page
-import MoinMoin.util # for MoinMoin 1.5.x
 from MoinMoin import wikiutil
 import EventAggregatorSupport
 
@@ -390,9 +389,6 @@
         request.write('</channel>\r\n')
         request.write('</rss>\r\n')
 
-    if EventAggregatorSupport.isMoin15():
-        raise MoinMoin.util.MoinMoinNoFooter
-
 def write_calendar_datetime(request, datetime):
 
     """