[Moin-devel] CVS: MoinMoin PageEditor.py,1.18,1.19 cgimain.py,1.56,1.57 editlog.py,1.16,1.17 request.py,1.13,1.14 security.py,1.4,1.5 user.py,1.60,1.61 userform.py,1.18,1.19 wikiaction.py,1.75,1.76 wikimacro.py,1.44,1.45 wikitest.py,1.2,1.3
J?rgen Hermann
jhermann at users.sourceforge.net
Wed Jun 12 14:10:08 EDT 2002
Update of /cvsroot/moin/MoinMoin
In directory usw-pr-cvs1:/tmp/cvs-serv11027
Modified Files:
PageEditor.py cgimain.py editlog.py request.py security.py
user.py userform.py wikiaction.py wikimacro.py wikitest.py
Log Message:
More info on Python installation in "?test" pages; pass request
object to user object
Index: PageEditor.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/PageEditor.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** PageEditor.py 5 Jun 2002 18:43:23 -0000 1.18
--- PageEditor.py 12 Jun 2002 21:09:48 -0000 1.19
***************
*** 284,288 ****
for uid in userlist:
if uid == request.user.id: continue # no self notification
! subscriber = user.User(uid)
if not subscriber.email: continue # skip empty email address
--- 284,288 ----
for uid in userlist:
if uid == request.user.id: continue # no self notification
! subscriber = user.User(request, uid)
if not subscriber.email: continue # skip empty email address
***************
*** 437,441 ****
# write the editlog entry
from MoinMoin import editlog
! log = editlog.makeLogStore()
remote_name = os.environ.get('REMOTE_ADDR', '')
log.addEntry(self.page_name, remote_name, mtime, kw.get('comment', ''))
--- 437,441 ----
# write the editlog entry
from MoinMoin import editlog
! log = editlog.makeLogStore(request)
remote_name = os.environ.get('REMOTE_ADDR', '')
log.addEntry(self.page_name, remote_name, mtime, kw.get('comment', ''))
Index: cgimain.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/cgimain.py,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -r1.56 -r1.57
*** cgimain.py 28 May 2002 18:50:20 -0000 1.56
--- cgimain.py 12 Jun 2002 21:09:48 -0000 1.57
***************
*** 47,65 ****
opened_logs = 1
request = createRequest(properties)
# Imports
! request.clock.start('imports')
! from MoinMoin import version, wikiutil, user, webapi
from MoinMoin.Page import Page
from MoinMoin.i18n import _
- request.clock.stop('imports')
# install stdout guard if available
if hasattr(webapi, 'StdoutGuard'):
sys.stdout = webapi.StdoutGuard(request)
-
- # !!! if all refs to user.current are removed, create the user together with the request instance
- request.user = user.current
# sys.stderr.write("----\n")
--- 47,61 ----
opened_logs = 1
+ # create request object, including default user
request = createRequest(properties)
# Imports
! from MoinMoin import version, wikiutil, webapi
from MoinMoin.Page import Page
from MoinMoin.i18n import _
# install stdout guard if available
if hasattr(webapi, 'StdoutGuard'):
sys.stdout = webapi.StdoutGuard(request)
# sys.stderr.write("----\n")
Index: editlog.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/editlog.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** editlog.py 27 Mar 2002 22:41:14 -0000 1.16
--- editlog.py 12 Jun 2002 21:09:48 -0000 1.17
***************
*** 25,29 ****
"""
! def __init__(self, optstr):
self.options = optstr
--- 25,30 ----
"""
! def __init__(self, request, optstr):
! self.request = request
self.options = optstr
***************
*** 52,57 ****
"""
! def __init__(self, optstr):
! LogBase.__init__(self, optstr)
self.filename = os.path.join(config.data_dir, optstr)
--- 53,58 ----
"""
! def __init__(self, request, optstr):
! LogBase.__init__(self, request, optstr)
self.filename = os.path.join(config.data_dir, optstr)
***************
*** 77,81 ****
logfile = open(self.filename, 'a+')
entry = string.join((wikiutil.quoteFilename(pagename), host, `mtime`,
! hostname, user.User().id, comment, action), "\t") + "\n"
try:
# fcntl.flock(logfile.fileno(), fcntl.LOCK_EX)
--- 78,82 ----
logfile = open(self.filename, 'a+')
entry = string.join((wikiutil.quoteFilename(pagename), host, `mtime`,
! hostname, self.request.user.id, comment, action), "\t") + "\n"
try:
# fcntl.flock(logfile.fileno(), fcntl.LOCK_EX)
***************
*** 91,95 ****
#############################################################################
! def makeLogStore(option=None):
""" Creates a storage object that provides an implementation of the
storage type given in the `option` parameter; option consists
--- 92,96 ----
#############################################################################
! def makeLogStore(request, option=None):
""" Creates a storage object that provides an implementation of the
storage type given in the `option` parameter; option consists
***************
*** 102,106 ****
schema, optstr = string.split(option, ':', 1)
if schema == "text":
! return LogText(optstr)
return None
--- 103,107 ----
schema, optstr = string.split(option, ':', 1)
if schema == "text":
! return LogText(request, optstr)
return None
***************
*** 121,125 ****
_NUM_FIELDS = 7
! def __init__(self, **kw):
self._index = 0
self._usercache = {}
--- 122,128 ----
_NUM_FIELDS = 7
! def __init__(self, request, **kw):
! self.request = request
!
self._index = 0
self._usercache = {}
***************
*** 194,198 ****
if self.userid:
if not self._usercache.has_key(self.userid):
! self._usercache[self.userid] = user.User(self.userid)
userdata = self._usercache[self.userid]
if userdata.name:
--- 197,201 ----
if self.userid:
if not self._usercache.has_key(self.userid):
! self._usercache[self.userid] = user.User(self.request, self.userid)
userdata = self._usercache[self.userid]
if userdata.name:
Index: request.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/request.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** request.py 8 Jun 2002 09:40:09 -0000 1.13
--- request.py 12 Jun 2002 21:09:48 -0000 1.14
***************
*** 42,48 ****
def __init__(self, properties={}):
from MoinMoin import i18n
- self.user = None
self.form = None
self.logger = None
--- 42,53 ----
def __init__(self, properties={}):
+ # order is important here!
+ from MoinMoin import user
+ self.user = user.User(self)
+ # !!! if all refs to user.current are removed, kill this assign
+ user.current = self.user
+
from MoinMoin import i18n
self.form = None
self.logger = None
Index: security.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/security.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** security.py 26 May 2002 19:56:24 -0000 1.4
--- security.py 12 Jun 2002 21:09:48 -0000 1.5
***************
*** 32,35 ****
--- 32,38 ----
def __init__(self, user):
+ """ Calculate the permissons `user` has.
+ """
+ # note that request object is in `self.user._request`
self.user = user
Index: user.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/user.py,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -r1.60 -r1.61
*** user.py 10 May 2002 23:12:08 -0000 1.60
--- user.py 12 Jun 2002 21:09:48 -0000 1.61
***************
*** 50,54 ****
_MAX_TRAIL = config.trail_size
! def __init__(self, id=None):
"""Init user with id"""
self.valid = 0
--- 50,54 ----
_MAX_TRAIL = config.trail_size
! def __init__(self, request, id=None):
"""Init user with id"""
self.valid = 0
***************
*** 68,71 ****
--- 68,72 ----
# attrs not saved to profile
+ self._request = request
self._trail = []
***************
*** 344,350 ****
self._trail = self._trail[-self._MAX_TRAIL:]
return self._trail
-
-
- # current user
- current = User()
--- 345,347 ----
Index: userform.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/userform.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** userform.py 15 May 2002 06:01:57 -0000 1.18
--- userform.py 12 Jun 2002 21:09:48 -0000 1.19
***************
*** 47,51 ****
cookie['MOIN_ID'].value, webapi.getScriptname(),))
os.environ['HTTP_COOKIE'] = ''
! request.user = user.User()
user.current = request.user
return _("<b>Cookie deleted!</b>")
--- 47,51 ----
cookie['MOIN_ID'].value, webapi.getScriptname(),))
os.environ['HTTP_COOKIE'] = ''
! request.user = user.User(request)
user.current = request.user
return _("<b>Cookie deleted!</b>")
***************
*** 62,66 ****
users = user.getUserList()
for uid in users:
! theuser = user.User(uid)
if theuser.email == email:
text = "%s\n\nID: %s\nName: %s\nLogin URL: %s?action=userform&uid=%s" % (
--- 62,66 ----
users = user.getUserList()
for uid in users:
! theuser = user.User(request, uid)
if theuser.email == email:
text = "%s\n\nID: %s\nName: %s\nLogin URL: %s?action=userform&uid=%s" % (
***************
*** 90,94 ****
# load the user data and check for validness
! theuser = user.User(uid)
if not theuser.valid:
return _("<b>Please enter a valid user id!</b>")
--- 90,94 ----
# load the user data and check for validness
! theuser = user.User(request, uid)
if not theuser.valid:
return _("<b>Please enter a valid user id!</b>")
***************
*** 100,104 ****
else:
# save user's profile, first get user instance
! theuser = user.User()
# try to get the name, if name is empty or missing, return an error msg
--- 100,104 ----
else:
# save user's profile, first get user instance
! theuser = user.User(request)
# try to get the name, if name is empty or missing, return an error msg
Index: wikiaction.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/wikiaction.py,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -r1.75 -r1.76
*** wikiaction.py 4 Jun 2002 20:47:51 -0000 1.75
--- wikiaction.py 12 Jun 2002 21:09:48 -0000 1.76
***************
*** 320,324 ****
from MoinMoin.util.dataset import TupleDataset, Column
! log = editlog.EditLog()
log.filter(pagename=pagename)
--- 320,324 ----
from MoinMoin.util.dataset import TupleDataset, Column
! log = editlog.EditLog(request)
log.filter(pagename=pagename)
Index: wikimacro.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/wikimacro.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** wikimacro.py 8 Jun 2002 08:08:45 -0000 1.44
--- wikimacro.py 12 Jun 2002 21:09:48 -0000 1.45
***************
*** 249,253 ****
row(_('Number of pages'), len(wikiutil.getPageList(config.text_dir)))
row(_('Number of backup versions'), len(wikiutil.getBackupList(config.backup_dir, None)))
! edlog = editlog.EditLog()
row(_('Entries in edit log'), _("%(logcount)s (%(logsize)s bytes)") %
{'logcount': len(edlog), 'logsize': edlog.size()})
--- 249,253 ----
row(_('Number of pages'), len(wikiutil.getPageList(config.text_dir)))
row(_('Number of backup versions'), len(wikiutil.getBackupList(config.backup_dir, None)))
! edlog = editlog.EditLog(self.request)
row(_('Entries in edit log'), _("%(logcount)s (%(logsize)s bytes)") %
{'logcount': len(edlog), 'logsize': edlog.size()})
Index: wikitest.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/wikitest.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** wikitest.py 28 May 2002 19:01:21 -0000 1.2
--- wikitest.py 12 Jun 2002 21:09:48 -0000 1.3
***************
*** 18,22 ****
# Note that importing here makes a difference, namely the request
# object is already created
! import os, string
from MoinMoin import config, util, version, editlog
--- 18,22 ----
# Note that importing here makes a difference, namely the request
# object is already created
! import os, sys, xml
from MoinMoin import config, util, version, editlog
***************
*** 24,27 ****
--- 24,32 ----
print 'Revision', version.revision
print
+ print 'Python version', sys.version
+ print 'Python installed to', sys.exec_prefix
+ print
+ print 'PyXML is %sinstalled' % (xml.__file__.find('_xmlplus') == -1 and 'NOT ' or '')
+ print
# check if the request is a local one
***************
*** 47,51 ****
# check editlog access
! log = editlog.makeLogStore()
msg = log.sanityCheck()
if msg: print "***", msg
--- 52,56 ----
# check editlog access
! log = editlog.makeLogStore(request)
msg = log.sanityCheck()
if msg: print "***", msg
***************
*** 58,62 ****
print "*** Could not find external diff utility '%s'!" % config.external_diff
else:
! print 'Found an external diff: "%s"' % (string.strip(lines[0]),)
# keep some values to ourselves
--- 63,67 ----
print "*** Could not find external diff utility '%s'!" % config.external_diff
else:
! print 'Found an external diff: "%s"' % (lines[0].strip(),)
# keep some values to ourselves
More information about the Moin-devel
mailing list