[FIX] auth_signup: flake8

bzr revid: chs@openerp.com-20120813132543-v79g6om8a4ge9zsb
This commit is contained in:
Christophe Simonis 2012-08-13 15:25:43 +02:00
parent 7c3a72300c
commit 4077ff353b
2 changed files with 14 additions and 14 deletions

View File

@ -3,7 +3,7 @@ import logging
import werkzeug.urls
import openerp.modules.registry
import openerp.addons.web.controllers.main
from openerp.addons.web.controllers.main import login_and_redirect
import openerp.addons.web.common.http as openerpweb
_logger = logging.getLogger(__name__)
@ -15,21 +15,21 @@ class OpenIDController(openerpweb.Controller):
def signup(self, req, dbname, name, login, password):
registry = openerp.modules.registry.RegistryManager.get(dbname)
cr = registry.db.cursor()
url = '/'
try:
try:
u = registry.get('res.users')
r = u.auth_signup(cr, 1, name, login, password)
Users = registry.get('res.users')
credentials = Users.auth_signup(cr, 1, name, login, password)
cr.commit()
return openerp.addons.web.controllers.main.login_and_redirect(req, dbname, login, password)
# or
req.authenticate(*r)
url = "/"
return login_and_redirect(req, *credentials)
except AttributeError:
# auth_signup is not installed
url = "/#action=auth_signup&error=1"
except Exception,e:
_logger.exception('attribute error when signup')
url = "/#action=auth_signup&error=NA" # Not Available
except Exception:
# signup error
url = "/#action=auth_signup&error=2"
_logger.exception('error when signup')
url = "/#action=auth_signup&error=UE" # Unexcpected Error
finally:
cr.close()
return werkzeug.utils.redirect(url)

View File

@ -1,5 +1,5 @@
import openerp
from openerp.osv import osv, fields
from openerp.osv import osv
class res_users(osv.Model):
_inherit = 'res.users'
@ -20,9 +20,9 @@ class res_users(osv.Model):
self.pool.get('res.users').create(cr, 1, new_user, context=context)
def auth_signup_check(self, cr, uid, login, key, context=None):
res = self.search(cr, uid, [("login","=",login)])
res = self.search(cr, uid, [("login", "=", login)])
if res:
user_id = res[0]['id']
user_id = res[0]
self.check(cr.dbname, user_id, key)
return user_id
return False
@ -41,7 +41,7 @@ class res_users(osv.Model):
'password': password,
'active': True,
}
self.auth_signup_create(cr,uid, new_user)
self.auth_signup_create(cr, uid, new_user)
return r
else:
print "Existing same"