[Moin-devel] CVS: MoinMoin Page.py,1.115,1.116 PageEditor.py,1.4,1.5 cgimain.py,1.50,1.51 userform.py,1.14,1.15 wikiaction.py,1.67,1.68 wikiform.py,1.4,1.5
J?rgen Hermann
jhermann at users.sourceforge.net
Wed Apr 17 14:05:41 EDT 2002
- Previous message (by thread): [Moin-devel] CVS: MoinMoin/action AttachFile.py,1.31,1.32 DeletePage.py,1.12,1.13 LikePages.py,1.11,1.12 SpellCheck.py,1.22,1.23
- Next message (by thread): [Moin-devel] CVS: MoinMoin/scripts moin_dump.py,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/moin/MoinMoin
In directory usw-pr-cvs1:/tmp/cvs-serv6126
Modified Files:
Page.py PageEditor.py cgimain.py userform.py wikiaction.py
wikiform.py
Log Message:
Page no longer imports request from cgimain
Index: Page.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/Page.py,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -r1.115 -r1.116
*** Page.py 17 Apr 2002 20:33:33 -0000 1.115
--- Page.py 17 Apr 2002 21:04:45 -0000 1.116
***************
*** 11,15 ****
import cStringIO, os, re, sys, string, urllib
from MoinMoin import caching, config, eventlog, user, util, wikiutil, webapi
- from MoinMoin.cgimain import request
from MoinMoin.i18n import _
--- 11,14 ----
***************
*** 156,160 ****
! def send_page(self, form, msg=None, **keywords):
""" Send the formatted page to stdout.
--- 155,159 ----
! def send_page(self, request, msg=None, **keywords):
""" Send the formatted page to stdout.
***************
*** 167,170 ****
--- 166,170 ----
request.clock.start('send_page')
import cgi
+ form = request.form
# determine modes
Index: PageEditor.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/PageEditor.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** PageEditor.py 17 Apr 2002 20:33:33 -0000 1.4
--- PageEditor.py 17 Apr 2002 21:04:45 -0000 1.5
***************
*** 49,53 ****
# check edit permissions
if not user.current.may.edit:
! self.send_page(form,
msg=_("""<b>You are not allowed to edit any pages.</b>"""))
return
--- 49,53 ----
# check edit permissions
if not user.current.may.edit:
! self.send_page(request,
msg=_("""<b>You are not allowed to edit any pages.</b>"""))
return
***************
*** 180,184 ****
' style="background-image:url(%s/img/draft.png); background-color:#F4F4F4;">'
'<tr><td>') % (config.url_prefix,)
! self.send_page(form, content_only=1, hilite_re=badwords_re)
print '</td></tr></table>'
--- 180,184 ----
' style="background-image:url(%s/img/draft.png); background-color:#F4F4F4;">'
'<tr><td>') % (config.url_prefix,)
! self.send_page(request, content_only=1, hilite_re=badwords_re)
print '</td></tr></table>'
Index: cgimain.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/cgimain.py,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** cgimain.py 16 Apr 2002 21:03:33 -0000 1.50
--- cgimain.py 17 Apr 2002 21:04:45 -0000 1.51
***************
*** 20,23 ****
--- 20,24 ----
global request
request = Request(properties)
+ return request
***************
*** 163,167 ****
# looks like user wants to save a drawing
from MoinMoin.action.AttachFile import execute
! execute(pagename, request.form)
sys.exit(0)
if action:
--- 164,168 ----
# looks like user wants to save a drawing
from MoinMoin.action.AttachFile import execute
! execute(pagename, request)
sys.exit(0)
if action:
Index: userform.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/userform.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** userform.py 15 Mar 2002 22:01:26 -0000 1.14
--- userform.py 17 Apr 2002 21:04:46 -0000 1.15
***************
*** 32,40 ****
}
! def savedata(pagename, form):
""" Handle POST request of the user preferences form
Return error msg or None
"""
if form.has_key('logout'):
# clear the cookie in the browser and locally
--- 32,42 ----
}
! def savedata(pagename, request):
""" Handle POST request of the user preferences form
Return error msg or None
"""
+ form = request.form
+
if form.has_key('logout'):
# clear the cookie in the browser and locally
Index: wikiaction.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/wikiaction.py,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -r1.67 -r1.68
*** wikiaction.py 17 Apr 2002 20:33:33 -0000 1.67
--- wikiaction.py 17 Apr 2002 21:04:46 -0000 1.68
***************
*** 144,148 ****
needle_re = re.compile(needle, re.IGNORECASE)
! Page(pagename).send_page(request.form, hilite_re=needle_re)
--- 144,148 ----
needle_re = re.compile(needle, re.IGNORECASE)
! Page(pagename).send_page(request, hilite_re=needle_re)
***************
*** 174,178 ****
oldversions = wikiutil.getBackupList(config.backup_dir, pagename)
if not oldversions:
! Page(pagename).send_page(request.form,
msg=_("<b>No older revisions available!</b>"))
return
--- 174,178 ----
oldversions = wikiutil.getBackupList(config.backup_dir, pagename)
if not oldversions:
! Page(pagename).send_page(request,
msg=_("<b>No older revisions available!</b>"))
return
***************
*** 202,206 ****
'count': edit_count,
'times': (_(' time'), _(' times'))[edit_count != 1]}
! Page(pagename).send_page(request.form, msg=msg)
return
--- 202,206 ----
'count': edit_count,
'times': (_(' time'), _(' times'))[edit_count != 1]}
! Page(pagename).send_page(request, msg=msg)
return
***************
*** 364,372 ****
def do_recall(pagename, request):
! Page(pagename, date=request.form['date'].value).send_page(request.form)
def do_show(pagename, request):
! Page(pagename).send_page(request.form, count_hit=1)
--- 364,372 ----
def do_recall(pagename, request):
! Page(pagename, date=request.form['date'].value).send_page(request)
def do_show(pagename, request):
! Page(pagename).send_page(request, count_hit=1)
***************
*** 388,392 ****
page = Page(pagename)
print '<!-- Transclusion of %s -->' % webapi.getQualifiedURL(page.url())
! page.send_page(request.form, count_hit=0, content_only=1)
sys.exit(0)
--- 388,392 ----
page = Page(pagename)
print '<!-- Transclusion of %s -->' % webapi.getQualifiedURL(page.url())
! page.send_page(request, count_hit=0, content_only=1)
sys.exit(0)
***************
*** 432,440 ****
pg.send_editor(request, preview=1, comment=comment)
elif request.form.has_key('button_cancel'):
! pg.send_page(request.form, msg=_('Edit was cancelled.'))
else:
savemsg = pg.save_text(request, savetext, datestamp,
stripspaces=rstrip, notify=notify, comment=comment)
! pg.send_page(request.form, msg=savemsg)
--- 432,440 ----
pg.send_editor(request, preview=1, comment=comment)
elif request.form.has_key('button_cancel'):
! pg.send_page(request, msg=_('Edit was cancelled.'))
else:
savemsg = pg.save_text(request, savetext, datestamp,
stripspaces=rstrip, notify=notify, comment=comment)
! pg.send_page(request, msg=savemsg)
***************
*** 484,494 ****
''')
! Page(pagename).send_page(request.form, msg=msg)
def do_userform(pagename, request):
from MoinMoin import userform
! savemsg=userform.savedata(pagename, request.form)
! Page(pagename).send_page(request.form, msg=savemsg)
--- 484,494 ----
''')
! Page(pagename).send_page(request, msg=msg)
def do_userform(pagename, request):
from MoinMoin import userform
! savemsg = userform.savedata(pagename, request)
! Page(pagename).send_page(request, msg=savemsg)
***************
*** 503,507 ****
user.current.setBookmark(tm)
! Page(pagename).send_page(request.form)
--- 503,507 ----
user.current.setBookmark(tm)
! Page(pagename).send_page(request)
***************
*** 547,551 ****
webapi.http_headers(["Content-Type: " + 'text/plain'])
! Page(pagename, formatter = Formatter(request)).send_page(request.form)
sys.exit(0)
--- 547,551 ----
webapi.http_headers(["Content-Type: " + 'text/plain'])
! Page(pagename, formatter = Formatter(request)).send_page(request)
sys.exit(0)
Index: wikiform.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/wikiform.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** wikiform.py 13 Feb 2002 21:13:52 -0000 1.4
--- wikiform.py 17 Apr 2002 21:04:46 -0000 1.5
***************
*** 86,90 ****
! def do_formtest(pagename, form):
""" Test a user defined form.
"""
--- 86,90 ----
! def do_formtest(pagename, request):
""" Test a user defined form.
"""
***************
*** 96,99 ****
msg = msg + '</ul>\n'
! Page(pagename).send_page(form, msg=msg)
--- 96,99 ----
msg = msg + '</ul>\n'
! Page(pagename).send_page(request, msg=msg)
- Previous message (by thread): [Moin-devel] CVS: MoinMoin/action AttachFile.py,1.31,1.32 DeletePage.py,1.12,1.13 LikePages.py,1.11,1.12 SpellCheck.py,1.22,1.23
- Next message (by thread): [Moin-devel] CVS: MoinMoin/scripts moin_dump.py,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Moin-devel
mailing list