[Moin-devel] CVS: MoinMoin Page.py,1.125,1.126

[J?rgen Hermann]

Update of /cvsroot/moin/MoinMoin
In directory usw-pr-cvs1:/tmp/cvs-serv13043

Modified Files:
	Page.py 
Log Message:
Removed "form" argument from format() call


Index: Page.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/Page.py,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -r1.125 -r1.126
*** Page.py	28 May 2002 19:34:05 -0000	1.125
--- Page.py	28 May 2002 22:42:02 -0000	1.126
***************
*** 160,167 ****
          request.clock.start('send_page')
          import cgi
-         form = request.form
  
          # determine modes
!         print_mode = form.has_key('action') and form['action'].value == 'print'
          content_only = keywords.get('content_only', 0)
          self.hilite_re = keywords.get('hilite_re', None)
--- 160,166 ----
          request.clock.start('send_page')
          import cgi
  
          # determine modes
!         print_mode = request.form.has_key('action') and request.form['action'].value == 'print'
          content_only = keywords.get('content_only', 0)
          self.hilite_re = keywords.get('hilite_re', None)
***************
*** 177,181 ****
          # if necessary, load the default formatter
          if self.default_formatter:
!             from formatter.text_html import Formatter
              self.formatter = Formatter(request, store_pagelinks=1)
          self.formatter.setPage(self)
--- 176,180 ----
          # if necessary, load the default formatter
          if self.default_formatter:
!             from MoinMoin.formatter.text_html import Formatter
              self.formatter = Formatter(request, store_pagelinks=1)
          self.formatter.setPage(self)
***************
*** 219,223 ****
                  # cascaded redirection
                  pi_redirect = args
!                 if form.has_key('action') or form.has_key('redirect') or content_only: continue
  
                  webapi.http_redirect(request, '%s/%s?action=show&redirect=%s' % (
--- 218,222 ----
                  # cascaded redirection
                  pi_redirect = args
!                 if request.form.has_key('action') or request.form.has_key('redirect') or content_only: continue
  
                  webapi.http_redirect(request, '%s/%s?action=show&redirect=%s' % (
***************
*** 289,294 ****
                              user.current.getFormattedDateTime(os.path.getmtime(self._text_filename()))},
                          msg)
!                 if form.has_key('redirect'):
!                     redir = form['redirect'].value
                      msg = '%s<b>%s</b><br>%s' % (
                          wikiutil.getSmiley('/!\\', self.formatter),
--- 288,293 ----
                              user.current.getFormattedDateTime(os.path.getmtime(self._text_filename()))},
                          msg)
!                 if request.form.has_key('redirect'):
!                     redir = request.form['redirect'].value
                      msg = '%s<b>%s</b><br>%s' % (
                          wikiutil.getSmiley('/!\\', self.formatter),
***************
*** 372,376 ****
          else:
              # parse the text and send the page content
!             Parser(body, request).format(self.formatter, form)
  
              # check for pending footnotes
--- 371,375 ----
          else:
              # parse the text and send the page content
!             Parser(body, request).format(self.formatter)
  
              # check for pending footnotes