# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1328480671 -3600
# Node ID 2ab697b13dcac51beafb53df7b3f58198e23db94
# Parent  5ed6c180a44e546731806c1af971e3535e258004
Simplified the formatting-related methods.

diff -r 5ed6c180a44e -r 2ab697b13dca EventAggregatorSupport.py
--- a/EventAggregatorSupport.py	Sun Feb 05 01:52:03 2012 +0100
+++ b/EventAggregatorSupport.py	Sun Feb 05 23:24:31 2012 +0100
@@ -339,11 +339,10 @@
 
     # Formatting-related functions.
 
-    def formatText(self, text, request, fmt):
+    def formatText(self, text, fmt):
 
         """
-        Format the given 'text' using the specified 'request' and formatter
-        'fmt'.
+        Format the given 'text' using the specified formatter 'fmt'.
         """
 
         # Assume plain text which is then formatted appropriately.
@@ -706,30 +705,32 @@
 
     # Formatting-related functions.
 
-    def getParserClass(self, request, format):
+    def getParserClass(self, format):
 
         """
-        Return a parser class using the 'request' for the given 'format', returning
-        a plain text parser if no parser can be found for the specified 'format'.
+        Return a parser class for the given 'format', returning a plain text
+        parser if no parser can be found for the specified 'format'.
         """
 
+        cfg = self.page.request.cfg
+
         try:
-            return wikiutil.searchAndImportPlugin(request.cfg, "parser", format or "plain")
+            return wikiutil.searchAndImportPlugin(cfg, "parser", format or "plain")
         except wikiutil.PluginMissingError:
-            return wikiutil.searchAndImportPlugin(request.cfg, "parser", "plain")
-
-    def formatText(self, text, request, fmt):
+            return wikiutil.searchAndImportPlugin(cfg, "parser", "plain")
+
+    def formatText(self, text, fmt):
 
         """
-        Format the given 'text' using the specified 'request' and formatter
-        'fmt'.
+        Format the given 'text' using the specified formatter 'fmt'.
         """
 
-        fmt.page = self.page
+        fmt.page = page = self.page
+        request = page.request
 
         # Suppress line anchors.
 
-        parser_cls = self.getParserClass(request, self.getFormat())
+        parser_cls = self.getParserClass(self.getFormat())
         parser = parser_cls(text, request, line_anchors=False)
 
         # Fix lists by indicating that a paragraph is already started.
@@ -2795,7 +2796,7 @@
                 output.append(fmt.table_cell(on=1, attrs=attrs))
 
                 if event_details.has_key("location"):
-                    output.append(event_page.formatText(event_details["location"], request, fmt))
+                    output.append(event_page.formatText(event_details["location"], fmt))
 
                 output.append(fmt.table_cell(on=0))
 
@@ -3111,7 +3112,7 @@
 
                     if event_details.has_key("location"):
                         output.append(fmt.paragraph(on=1))
-                        output.append(event_page.formatText(event_details["location"], request, fmt))
+                        output.append(event_page.formatText(event_details["location"], fmt))
                         output.append(fmt.paragraph(on=1))
 
                     # Topics.
@@ -3121,7 +3122,7 @@
 
                         for topic in event_details.get("topics") or event_details.get("categories") or []:
                             output.append(fmt.listitem(on=1))
-                            output.append(event_page.formatText(topic, request, fmt))
+                            output.append(event_page.formatText(topic, fmt))
                             output.append(fmt.listitem(on=0))
 
                         output.append(fmt.bullet_list(on=0))
diff -r 5ed6c180a44e -r 2ab697b13dca actions/EventAggregatorSummary.py
--- a/actions/EventAggregatorSummary.py	Sun Feb 05 01:52:03 2012 +0100
+++ b/actions/EventAggregatorSummary.py	Sun Feb 05 23:24:31 2012 +0100
@@ -2,7 +2,7 @@
 """
     MoinMoin - EventAggregatorSummary Action
 
-    @copyright: 2008, 2009, 2010, 2011 by Paul Boddie <paul@boddie.org.uk>
+    @copyright: 2008, 2009, 2010, 2011, 2012 by Paul Boddie <paul@boddie.org.uk>
     @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
                 2003-2008 MoinMoin:ThomasWaldmann,
                 2004-2006 MoinMoin:AlexanderSchremmer,
@@ -423,11 +423,11 @@
                 description = event_details["last-comment"]
 
             request.write('<description>%s</description>\r\n' %
-                fmt.text(event_page.formatText(description, request, fmt)))
+                fmt.text(event_page.formatText(description, fmt)))
 
             for topic in event_details.get("topics") or event_details.get("categories") or []:
                 request.write('<category>%s</category>\r\n' %
-                    fmt.text(event_page.formatText(topic, request, fmt)))
+                    fmt.text(event_page.formatText(topic, fmt)))
 
             request.write('<pubDate>%s</pubDate>\r\n' % event_details["created"].as_HTTP_datetime_string())
             request.write('<guid>%s#%s</guid>\r\n' % (link, event_details["sequence"]))
diff -r 5ed6c180a44e -r 2ab697b13dca macros/EventAggregator.py
--- a/macros/EventAggregator.py	Sun Feb 05 01:52:03 2012 +0100
+++ b/macros/EventAggregator.py	Sun Feb 05 23:24:31 2012 +0100
@@ -2,7 +2,7 @@
 """
     MoinMoin - EventAggregator Macro
 
-    @copyright: 2008, 2009, 2010, 2011 by Paul Boddie <paul@boddie.org.uk>
+    @copyright: 2008, 2009, 2010, 2011, 2012 by Paul Boddie <paul@boddie.org.uk>
     @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
                 2005-2008 MoinMoin:ThomasWaldmann
     @license: GNU GPL (v2 or later), see COPYING.txt for details.