Changeset 5055

Timestamp:

11 Mar 2010, 13:30:48 (15 years ago)

Author:

uli

Message:

BBB imports.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/authentication.py (modified) (5 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/authentication.py

@@ -2 +2 @@
 """
 import grok
-from zope.app.authentication.session import SessionCredentialsPlugin
-from zope.app.authentication.interfaces import (ICredentialsPlugin,
-                                                IAuthenticatorPlugin,
-                                                IPrincipalInfo,
-                                                IPasswordManager)
+import waeup.sirp.permissions
 from zope.component import getUtility
+try:
+    from zope.pluggableauth.plugins.session import SessionCredentialsPlugin
+except ImportError:
+    # BBB
+    from zope.app.authentication.session import SessionCredentialsPlugin
+try:
+    from zope.pluggableauth.interfaces import (
+        ICredentialsPlugin, IAuthenticatorPlugin, IPrincipalInfo)
+    from zope.password.interfaces import IPasswordManager
+except ImportError:
+    # BBB
+    from zope.app.authentication.interfaces import (
+        ICredentialsPlugin, IAuthenticatorPlugin, IPrincipalInfo,
+        IPasswordManager)
 from zope.securitypolicy.interfaces import IPrincipalRoleManager
 from zope.securitypolicy.principalrole import principalRoleManager
 from waeup.sirp.interfaces import IUserAccount
-import waeup.sirp.permissions
 
 def setup_authentication(pau):
@@ -44 +53 @@
     grok.implements(IUserAccount)
 
-
     def __init__(self, name, password, title=None, description=None,
                  roles = []):
@@ -70 +78 @@
                  if x[0].startswith('waeup.')]
         return roles
-    
+
     def setRoles(self, roles):
         prm = self._getPrincipalRoleManager()
-        
+
         old_roles = self.getRoles()
         for role in old_roles:
@@ -90 +98 @@
             return IPrincipalRoleManager(portal)
         return principalRoleManager
-        
-    
+
 class UserAuthenticatorPlugin(grok.GlobalUtility):
     grok.provides(IAuthenticatorPlugin)
@@ -138 +145 @@
             return
         usercontainer.addUser(name, password, title, description)
-        
+
     def getUserContainer(self):
         site = grok.getSite()