changeset 888:d3066011d048

remove request.no_closing_html
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Thu, 06 Jul 2006 16:22:04 +0200
parents 21095ba16b58
children ad62767ffd0c
files MoinMoin/action/rss_rc.py MoinMoin/request/__init__.py MoinMoin/theme/__init__.py
diffstat 3 files changed, 14 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/rss_rc.py	Tue Jul 04 10:31:25 2006 +0200
+++ b/MoinMoin/action/rss_rc.py	Thu Jul 06 16:22:04 2006 +0200
@@ -54,8 +54,9 @@
     if interwiki[-1] != "/": interwiki = interwiki + "/"
 
     logo = re.search(r'src="([^"]*)"', cfg.logo_string)
-    if logo: logo = request.getQualifiedURL(logo.group(1))
-    
+    if logo:
+        logo = request.getQualifiedURL(logo.group(1))
+
     log = editlog.EditLog(request)
     logdata = []
     counter = 0
@@ -148,7 +149,7 @@
             handler.simpleNode('link', link+"?action=diff")
         else:
             handler.simpleNode('link', link)
-            
+
         handler.simpleNode(('dc', 'date'), timefuncs.W3CDate(item.time))
 
         # description
@@ -183,10 +184,10 @@
         else: # 'ip'
             edname = item.editor[1]
             ##edattr[(None, 'link')] = link + "?action=info"
-        
+
         # this edattr stuff, esp. None as first tuple element breaks things (tracebacks)
         # if you know how to do this right, please send us a patch
-        
+
         handler.startNode(('dc', 'contributor'))
         handler.startNode(('rdf', 'Description'), attr=edattr)
         handler.simpleNode(('rdf', 'value'), edname)
@@ -221,6 +222,4 @@
     # send the generated XML document
     request.http_headers(httpheaders)
     request.write(out.getvalue())
-    request.finish()
-    request.no_closing_html_code = 1
 
--- a/MoinMoin/request/__init__.py	Tue Jul 04 10:31:25 2006 +0200
+++ b/MoinMoin/request/__init__.py	Thu Jul 06 16:22:04 2006 +0200
@@ -165,7 +165,6 @@
             self.logger = None
             self.pragma = {}
             self.mode_getpagelinks = 0
-            self.no_closing_html_code = 0
 
             self.lang = i18n.requestLanguage(self) 
             # Language for content. Page content should use the wiki default lang,
--- a/MoinMoin/theme/__init__.py	Tue Jul 04 10:31:25 2006 +0200
+++ b/MoinMoin/theme/__init__.py	Thu Jul 06 16:22:04 2006 +0200
@@ -1690,14 +1690,13 @@
         request.clock.stop('total')
 
         # Close html code
-        if not request.no_closing_html_code:
-            if (request.cfg.show_timings and
-                request.form.get('action', [None])[0] != 'print'):
-                request.write('<ul id="timings">\n')
-                for t in request.clock.dump():
-                    request.write('<li>%s</li>\n' % t)
-                request.write('</ul>\n')
-            #request.write('<!-- auth_method == %s -->' % repr(request.user.auth_method))
-            request.write('</body>\n</html>\n\n')
+        if (request.cfg.show_timings and
+            request.form.get('action', [None])[0] != 'print'):
+            request.write('<ul id="timings">\n')
+            for t in request.clock.dump():
+                request.write('<li>%s</li>\n' % t)
+            request.write('</ul>\n')
+        #request.write('<!-- auth_method == %s -->' % repr(request.user.auth_method))
+        request.write('</body>\n</html>\n\n')