Mercurial Repository: p/roundup/code: roundup/cgi/actions.py comparison

comparison roundup/cgi/actions.py @ 2934:c8ee5907f1e2

pychecker cleanup

author	Alexander Smishlajev <a1s@users.sourceforge.net>
date	Thu, 18 Nov 2004 17:20:40 +0000
parents	9ecca789544f
children	3dca84b1a8f5

comparison

equal deleted inserted replaced

-:6574d6736b57
+:c8ee5907f1e2
-#$Id: actions.py,v 1.38 2004-11-18 15:58:23 a1s Exp $
+#$Id: actions.py,v 1.39 2004-11-18 17:20:40 a1s Exp $
 import re, cgi, StringIO, urllib, Cookie, time, random
 from roundup import hyperdb, token, date, password, rcsv, exceptions
 from roundup.i18n import _
 self.userid = client.userid
 self.base = client.base
 self.user = client.user
 self.context = templating.context(client)
+def handle(self):
+"""Action handler procedure"""
+raise NotImplementedError
 def execute(self):
 """Execute the action specified by this object."""
 self.permission()
 return self.handle()
 return self.client.translator.gettext(msgid)
 _ = gettext
 class ShowAction(Action):
-def handle(self, typere=re.compile('[@:]type'),
-numre=re.compile('[@:]number')):
+typere=re.compile('[@:]type')
+numre=re.compile('[@:]number')
+def handle(self):
 """Show a node of a particular class/id."""
 t = n = ''
 for key in self.form.keys():
-if typere.match(key):
+if self.typere.match(key):
 t = self.form[key].value.strip()
-elif numre.match(key):
+elif self.numre.match(key):
 n = self.form[key].value.strip()
 if not t:
 raise ValueError, self._('No type specified')
 if not n:
 raise exceptions.SeriousError, self._('No ID entered')
 class SearchAction(Action):
 name = 'search'
 permissionType = 'View'
-def handle(self, wcre=re.compile(r'[\s,]+')):
+def handle(self):
 """Mangle some of the form variables.
 Set the form ":filter" variable based on the values of the filter
 variables - if they're set to anything other than "dontcare" then add
 them to :filter.
 # all OK
 self.db.commit()
 self.client.ok_message.append(self._('Items edited OK'))
-class EditCommon:
+class EditCommon(Action):
 '''Utility methods for editing.'''
-def _editnodes(self, all_props, all_links, newids=None):
+def _editnodes(self, all_props, all_links):
 ''' Use the props in all_props to perform edit and creation, then
 use the link specs in all_links to do linking.
 '''
 # figure dependencies and re-work links
 deps = {}
 Base behaviour is to check the user can edit this class. No additional
 property checks are made.
 """
 return self.hasPermission('Create', self.classname)
-class EditItemAction(EditCommon, Action):
+class EditItemAction(EditCommon):
 def lastUserActivity(self):
 if self.form.has_key(':lastactivity'):
 d = date.Date(self.form[':lastactivity'].value)
 elif self.form.has_key('@lastactivity'):
 d = date.Date(self.form['@lastactivity'].value)
 return activity
 def detectCollision(self, user_activity, node_activity):
 if user_activity:
 return user_activity < node_activity
+else:
+return 0
 def handleCollision(self):
 self.client.template = 'collision'
 def handle(self):
 if self.nodeid is None:
 req = templating.HTMLRequest(self.client)
 url += '&' + req.indexargs_href('', {})[1:]
 raise exceptions.Redirect, url
-class NewItemAction(EditCommon, Action):
+class NewItemAction(EditCommon):
 def handle(self):
 ''' Add a new item to the database.
 This follows the same form as the EditItemAction, with the same
 special form values.
 if not self.client.standard_message([address], subject, body):
 return
 self.client.ok_message.append(self._('Email sent to %s') % address)
-class RegoCommon:
+class RegoCommon(Action):
 def finishRego(self):
 # log the new user in
 self.client.userid = self.userid
 user = self.client.user = self.db.user.get(self.userid, 'username')
 # re-open the database for real, using the user
 <body><p><a href="%s">%s</a></p>
 <script type="text/javascript">
 window.setTimeout('window.location = "%s"', 1000);
 </script>'''%(message, url, message, url)
-class ConfRegoAction(RegoCommon, Action):
+class ConfRegoAction(RegoCommon):
 def handle(self):
 """Grab the OTK, use it to load up the new user details."""
 try:
 # pull the rego information out of the otk database
 self.userid = self.db.confirm_registration(self.form['otk'].value)
 except (ValueError, KeyError), message:
 self.client.error_message.append(str(message))
 return
 self.finishRego()
-class RegisterAction(RegoCommon, EditCommon, Action):
+class RegisterAction(RegoCommon, EditCommon):
 name = 'register'
 permissionType = 'Create'
 def handle(self):
 """Attempt to create a new user based on the contents of the form
 # commit now that all the tricky stuff is done
 self.db.commit()
 # finish off by logging the user in
 self.userid = self.nodeid
-return self.finishRego()
+self.finishRego()
+return
 # generate the one-time-key and store the props for later
 for propname, proptype in self.db.user.getprops().items():
 value = user_props.get(propname, None)
 if value is None:
 if not self.hasPermission("Web Access"):
 raise exceptions.LoginError, self._(
 "You do not have permission to login")
 def verifyPassword(self, userid, password):
-''' Verify the password that the user has supplied
+'''Verify the password that the user has supplied'''
-'''
+stored = self.db.user.get(userid, 'password')
-stored = self.db.user.get(self.client.userid, 'password')
 if password == stored:
 return 1
 if not password and not stored:
 return 1
 return 0
 for itemid in klass.filter(matches, filterspec, sort, group):
 writer.writerow([str(klass.get(itemid, col)) for col in columns])
 return '\n'
-# vim: set filetype=python ts=4 sw=4 et si :
+# vim: set filetype=python sts=4 sw=4 et si :

Mercurial > p > roundup > code

comparison roundup/cgi/actions.py @ 2934:c8ee5907f1e2