[Checkins] SVN: Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/ User ids are never decorated (only logins are).

[Stefan H. Holek]

Log message for revision 97553:
  User ids are never decorated (only logins are).

Changed:
  U   Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/PluggableAuthService.py
  U   Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/tests/test_masquerading.py

-=-
Modified: Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/PluggableAuthService.py
===================================================================
--- Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/PluggableAuthService.py	2009-03-06 00:01:16 UTC (rev 97552)
+++ Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/PluggableAuthService.py	2009-03-06 00:08:15 UTC (rev 97553)
@@ -814,10 +814,6 @@
             return None
 
         # Masquerading: Lookup role_user
-        auth_user_id, role_user_id = splitmasq( user_id )
-        if role_user_id is not None:
-            user_id = role_user_id
-
         auth_user_login, role_user_login = splitmasq( login )
         if role_user_login is not None:
             login = role_user_login

Modified: Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/tests/test_masquerading.py
===================================================================
--- Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/tests/test_masquerading.py	2009-03-06 00:01:16 UTC (rev 97552)
+++ Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/tests/test_masquerading.py	2009-03-06 00:08:15 UTC (rev 97553)
@@ -162,11 +162,6 @@
         uids = self.pas._extractUserIds(request, self.pas.plugins)
         self.assertEqual(len(uids), 0)
 
-    def test__verifyUser_by_id(self):
-        info = self.pas._verifyUser(self.pas.plugins, user_id='fred_id/wilma_id')
-        self.assertEqual(info['id'], 'wilma_id')
-        self.assertEqual(info['login'], 'wilma')
-
     def test__verifyUser_by_login(self):
         info = self.pas._verifyUser(self.pas.plugins, login='fred/wilma')
         self.assertEqual(info['id'], 'wilma_id')