From 4077ff353b89c3683b22ee2a5a89d2999a846689 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 13 Aug 2012 15:25:43 +0200
Subject: [PATCH] [FIX] auth_signup: flake8

bzr revid: chs@openerp.com-20120813132543-v79g6om8a4ge9zsb
---
 addons/auth_signup/controllers/main.py | 20 ++++++++++----------
 addons/auth_signup/res_users.py        |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 7b84c2e2214..b67a391c4c1 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -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)
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 1c9e531c180..0076787cc6d 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -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"