[Checkins] SVN: Products.PluggableAuthService/trunk/Products/PluggableAuthService/ Zope 2.12 compatibility - removed Interface.Implements import if zope.interface available.

[Laurence Rowe]

Log message for revision 86851:
  Zope 2.12 compatibility - removed Interface.Implements import if zope.interface available.

Changed:
  U   Products.PluggableAuthService/trunk/Products/PluggableAuthService/doc/CHANGES.txt
  U   Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/BasePlugin.py

-=-
Modified: Products.PluggableAuthService/trunk/Products/PluggableAuthService/doc/CHANGES.txt
===================================================================
--- Products.PluggableAuthService/trunk/Products/PluggableAuthService/doc/CHANGES.txt	2008-05-20 03:05:12 UTC (rev 86850)
+++ Products.PluggableAuthService/trunk/Products/PluggableAuthService/doc/CHANGES.txt	2008-05-20 03:18:39 UTC (rev 86851)
@@ -8,6 +8,9 @@
         for 'startswith' test and (if the IPy module is present) IP-range
         tests.  See https://bugs.launchpad.net/zope-pas/+bug/173580 .
 
+      - Zope 2.12 compatibility - removed Interface.Implements import if
+        zope.interface available.
+
     Bugs fixed
 
       - plugins/ZODBRoleManager: added logging in case searchPrincipial()

Modified: Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/BasePlugin.py
===================================================================
--- Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/BasePlugin.py	2008-05-20 03:05:12 UTC (rev 86850)
+++ Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/BasePlugin.py	2008-05-20 03:18:39 UTC (rev 86851)
@@ -21,7 +21,13 @@
 from Acquisition import aq_parent, aq_inner
 from AccessControl import ClassSecurityInfo
 from App.class_init import default__class_init__ as InitializeClass
-from Interface.Implements import flattenInterfaces
+try:
+    from zope.interface import Interface
+except ImportError:
+    from Interface.Implements import flattenInterfaces
+else:
+    def flattenInterfaces(implemented):
+        return implemented.flattened()
 
 from zope.interface import implementedBy
 from zope.interface import providedBy