[Erp5-report] r21241 - /erp5/trunk/products/ERP5Security/ERP5UserManager.py

[nobody at svn.erp5.org]

Author: vincent
Date: Fri May 30 15:09:39 2008
New Revision: 21241

URL: http://svn.erp5.org?rev=21241&view=rev
Log:
Revert parts of r20897 because getUserByLogin always checks & converts its parameters now.

Modified:
    erp5/trunk/products/ERP5Security/ERP5UserManager.py

Modified: erp5/trunk/products/ERP5Security/ERP5UserManager.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Security/ERP5UserManager.py?rev=21241&r1=21240&r2=21241&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Security/ERP5UserManager.py (original)
+++ erp5/trunk/products/ERP5Security/ERP5UserManager.py Fri May 30 15:09:39 2008
@@ -88,7 +88,7 @@
             if not login or not password:
                 return None
 
-            user_list = self.getUserByLogin((login,))
+            user_list = self.getUserByLogin(login)
 
             if not user_list:
                 return None
@@ -172,10 +172,10 @@
 
         if id is None:
           id = login
+        if isinstance(id, str):
+          id = (id,)
         if isinstance(id, list):
           id = tuple(id)
-        elif not isinstance(id, tuple):
-          id = (id,)
         return _enumerateUsers(id_tuple=id,
                                exact_match=exact_match,
                                path=self.getPhysicalPath())