changeset 5178:d60888cbfb22

merge moin/1.8
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sat, 03 Oct 2009 22:40:53 +0200
parents c16381dd17fe (current diff) 84c05e657b47 (diff)
children 506a24108050
files MoinMoin/Page.py MoinMoin/action/RenamePage.py MoinMoin/web/contexts.py
diffstat 3 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/Page.py	Sat Oct 03 22:27:50 2009 +0200
+++ b/MoinMoin/Page.py	Sat Oct 03 22:40:53 2009 +0200
@@ -1035,7 +1035,7 @@
             redirect_url = Page(request, pagename).url(request,
                                                        querystr={'action': 'show', 'redirect': self.page_name, },
                                                        anchor=anchor)
-            request.http_redirect(redirect_url, status='301')
+            request.http_redirect(redirect_url, code=301)
             return
 
         # if necessary, load the formatter
--- a/MoinMoin/action/RenamePage.py	Sat Oct 03 22:27:50 2009 +0200
+++ b/MoinMoin/action/RenamePage.py	Sat Oct 03 22:40:53 2009 +0200
@@ -72,7 +72,7 @@
     def do_action_finish(self, success):
         if success:
             url = Page(self.request, self.newpagename).url(self.request)
-            self.request.http_redirect(url, status='301')
+            self.request.http_redirect(url, code=301)
         else:
             self.render_msg(self.make_form(), "dialog")
 
--- a/MoinMoin/web/contexts.py	Sat Oct 03 22:27:50 2009 +0200
+++ b/MoinMoin/web/contexts.py	Sat Oct 03 22:40:53 2009 +0200
@@ -266,9 +266,9 @@
             self.headers.set('Pragma', 'no-cache')
         self.request.expires = time.time() - 3600 * 24 * 365
 
-    def http_redirect(self, url, status='302'):
+    def http_redirect(self, url, code=302):
         """ Raise a simple redirect exception. """
-        abort(redirect(url, code=int(status)))
+        abort(redirect(url, code=code))
 
     # the output related methods
     def write(self, *data):