changeset 656:ad2ac49d17fe

use only action=show with mimetype instead of deprecated format action
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Tue, 16 May 2006 13:10:13 +0200
parents 54b8e7d068d9
children 016a8a3ef354
files MoinMoin/action/RenderAsDocbook.py MoinMoin/action/__init__.py MoinMoin/multiconfig.py MoinMoin/parser/rst.py
diffstat 4 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/RenderAsDocbook.py	Tue May 16 09:25:59 2006 +0200
+++ b/MoinMoin/action/RenderAsDocbook.py	Tue May 16 13:10:13 2006 +0200
@@ -8,7 +8,7 @@
 from MoinMoin.Page import Page
 
 def execute(pagename, request):
-    url = Page(request, pagename).url(request, {'action': 'format',
+    url = Page(request, pagename).url(request, {'action': 'show',
                                                 'mimetype': 'xml/docbook'}, 0)
     request.http_redirect(url)
 
--- a/MoinMoin/action/__init__.py	Tue May 16 09:25:59 2006 +0200
+++ b/MoinMoin/action/__init__.py	Tue May 16 13:10:13 2006 +0200
@@ -244,9 +244,8 @@
         Since 5.5.2006 this functionality is also done by do_show, but do_format
         has a default of text/plain when no format is given.
         It also does not count in statistics and also does not set the cacheable flag.
-        TODO: remove this action when we don't need it any more for compatibility.
+        DEPRECATED: remove this action when we don't need it any more for compatibility.
     """
-    # get the MIME type
     if not request.form.has_key('mimetype'):
         request.form['mimetype'] = [u"text/plain"]
     do_show(pagename, request, count_hit=0, cacheable=0)
--- a/MoinMoin/multiconfig.py	Tue May 16 09:25:59 2006 +0200
+++ b/MoinMoin/multiconfig.py	Tue May 16 13:10:13 2006 +0200
@@ -309,7 +309,7 @@
         'unsubscribe': ("%(q_page_name)s?action=subscribe", _("UnSubscribe"), "unsubscribe"),
         'subscribe':   ("%(q_page_name)s?action=subscribe", _("Subscribe"), "subscribe"),
         'raw':         ("%(q_page_name)s?action=raw", _("Raw"), "raw"),
-        'xml':         ("%(q_page_name)s?action=format&amp;mimetype=text/xml", _("XML"), "xml"),
+        'xml':         ("%(q_page_name)s?action=show&amp;mimetype=text/xml", _("XML"), "xml"),
         'print':       ("%(q_page_name)s?action=print", _("Print"), "print"),
         'view':        ("%(q_page_name)s", _("View"), "view"),
         'up':          ("%(q_page_parent_page)s", _("Up"), "up"),
--- a/MoinMoin/parser/rst.py	Tue May 16 09:25:59 2006 +0200
+++ b/MoinMoin/parser/rst.py	Tue May 16 13:10:13 2006 +0200
@@ -216,7 +216,7 @@
         RawHTMLList catches all html appended to internal HTMLTranslator lists.
         It passes the HTML through the MoinMoin rawHTML formatter to strip 
         markup when necessary. This is to support other formatting outputs
-        (such as ?action=format&mimetype=text/plain).
+        (such as ?action=show&mimetype=text/plain).
     """
     
     def __init__(self, formatter):