Changeset 5054 for main/waeup.sirp/trunk/src

Timestamp:

11 Mar 2010, 13:25:41 (15 years ago)

Author:

uli

Message:

• BBB imports for older groktoolkit.

• Reorder imports (PEP 8)

File:

• main/waeup.sirp/trunk/src/waeup/sirp/app.py (modified) (2 diffs)

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

@@ -2 +2 @@
 import logging
 import os
-from zope.app.authentication.authentication import PluggableAuthentication
-from zope.app.security.interfaces import IAuthentication
+try:
+    from zope.authentication.interfaces import IAuthentication
+except:
+    # BBB
+    from zope.app.security.interfaces import IAuthentication
 from zope.component import createObject, getAllUtilitiesRegisteredFor
+try:
+    from zope.pluggableauth import PluggableAuthentication
+except ImportError:
+    # BBB
+    from zope.app.authentication.authentication import PluggableAuthentication
 
+from waeup.sirp.authentication import setup_authentication
+from waeup.sirp.datacenter import DataCenter
 from waeup.sirp.interfaces import (
     IUniversity, IDataCenter, IWAeUPSIRPPluggable,
     IDataCenterStorageMovedEvent)
-from waeup.sirp.authentication import setup_authentication
-from waeup.sirp.datacenter import DataCenter
 from waeup.sirp.users import UserContainer
 
@@ -21 +29 @@
     grok.local_utility(
         PluggableAuthentication, provides = IAuthentication,
-        setup = setup_authentication)
-
+        setup = setup_authentication,)
+    
     @property
     def logger(self):