Merge lp:~kangol/openobject-client-web/trunk-autocleanloginfields into lp:openobject-client-web/trunk

[Christophe Simonis (OpenERP)]

The function clean_login_fields on decorated secured methods remove the known fields from the kwargs. As an web-addons can add fields to the login page, thoses new fields need to be removed as well. As conventions, theses fields have to starts with "login_".

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Modified a pair of things during merge: used `del kw[k]` in the second loop as we know the key is in the dict (we got it from there), and replaced the string-splitting by a literal tuple (let's not use perl-isms for 3 constant strings in a function)

=== modified file 'addons/openerp/controllers/utils.py'
--- addons/openerp/controllers/utils.py	2010-11-18 13:32:02 +0000
+++ addons/openerp/controllers/utils.py	2010-12-14 18:04:53 +0000
@@ -91,27 +91,23 @@
 def secured(fn):
     """A Decorator to make a SecuredController controller method secured.
     """
-    def clear_login_fields(kw={}):
+    def clear_login_fields(kw):
 
         if not kw.get('login_action'):
             return
 
-        if kw.has_key('db'): del kw['db']
-        if kw.has_key('user'): del kw['user']
-        if kw.has_key('password'): del kw['password']
-        if kw.has_key('login_action'): del kw['login_action']
+        for k in 'db user password'.split():
+            kw.pop(k, None)
+        for k in kw.keys():
+            if k.startswith('login_'):
+                kw.pop(k, None)
 
     def get_orig_args(kw={}):
         if not kw.get('login_action'):
             return kw
 
         new_kw = kw.copy()
-
-        if new_kw.has_key('db'): del new_kw['db']
-        if new_kw.has_key('user'): del new_kw['user']
-        if new_kw.has_key('password'): del new_kw['password']
-        if new_kw.has_key('login_action'): del new_kw['login_action']
-
+        clear_login_fields(new_kw)
         return new_kw
 
     def wrapper(*args, **kw):