[Checkins] SVN: Products.PluginRegistry/trunk/Products/PluginRegistry/ Purge old zope2 Interface interfaces for Zope 2.12 compatibility.

[Laurence Rowe]

Log message for revision 86850:
  Purge old zope2 Interface interfaces for Zope 2.12 compatibility.

Changed:
  U   Products.PluginRegistry/trunk/Products/PluginRegistry/CHANGES.txt
  U   Products.PluginRegistry/trunk/Products/PluginRegistry/PluginRegistry.py
  U   Products.PluginRegistry/trunk/Products/PluginRegistry/exportimport.py
  U   Products.PluginRegistry/trunk/Products/PluginRegistry/interfaces.py
  U   Products.PluginRegistry/trunk/Products/PluginRegistry/tests/test_PluginRegistry.py
  U   Products.PluginRegistry/trunk/Products/PluginRegistry/utils.py

-=-
Modified: Products.PluginRegistry/trunk/Products/PluginRegistry/CHANGES.txt
===================================================================
--- Products.PluginRegistry/trunk/Products/PluginRegistry/CHANGES.txt	2008-05-20 02:59:03 UTC (rev 86849)
+++ Products.PluginRegistry/trunk/Products/PluginRegistry/CHANGES.txt	2008-05-20 03:05:12 UTC (rev 86850)
@@ -1,6 +1,8 @@
 PluginRegistry Product Changelog
 
   PluginRegistry 1.2 (unreleased)
+
+    - Purge old zope2 Interface interfaces for Zope 2.12 compatibility.
   
     - Fix bad behaviour when moving the top plugin up.
       (https://bugs.launchpad.net/bugs/164717)

Modified: Products.PluginRegistry/trunk/Products/PluginRegistry/PluginRegistry.py
===================================================================
--- Products.PluginRegistry/trunk/Products/PluginRegistry/PluginRegistry.py	2008-05-20 02:59:03 UTC (rev 86849)
+++ Products.PluginRegistry/trunk/Products/PluginRegistry/PluginRegistry.py	2008-05-20 03:05:12 UTC (rev 86850)
@@ -66,14 +66,7 @@
 
     o Each plugin type holds an ordered list of ( id, wrapper ) tuples.
     """
-    if _HAS_Z3_INTERFACES:
-        if _HAS_Z3_DAV_INTERFACES:
-            implements(IPluginRegistry, IWriteLock)
-        else:
-            implements(IPluginRegistry)
-            __implements__ = (WriteLockInterface,)
-    else:
-        __implements__ = (IPluginRegistry, WriteLockInterface,)
+    implements(IPluginRegistry, IWriteLock)
 
     security = ClassSecurityInfo()
 

Modified: Products.PluginRegistry/trunk/Products/PluginRegistry/exportimport.py
===================================================================
--- Products.PluginRegistry/trunk/Products/PluginRegistry/exportimport.py	2008-05-20 02:59:03 UTC (rev 86849)
+++ Products.PluginRegistry/trunk/Products/PluginRegistry/exportimport.py	2008-05-20 03:05:12 UTC (rev 86850)
@@ -37,10 +37,7 @@
 from interfaces import IPluginRegistry
 
 def _providedBy(obj, iface):
-    try:
-        return iface.providedBy(obj)
-    except AttributeError:
-        return iface.isImplementedBy(obj) # Z2 interfaces
+    return iface.providedBy(obj)
 
 _FILENAME = 'pluginregistry.xml'
 

Modified: Products.PluginRegistry/trunk/Products/PluginRegistry/interfaces.py
===================================================================
--- Products.PluginRegistry/trunk/Products/PluginRegistry/interfaces.py	2008-05-20 02:59:03 UTC (rev 86849)
+++ Products.PluginRegistry/trunk/Products/PluginRegistry/interfaces.py	2008-05-20 03:05:12 UTC (rev 86850)
@@ -16,14 +16,10 @@
 
 $Id$
 """
-try:
-    from zope.interface import Interface
-except:  # BBB?
-    from Interface import Interface
-    _HAS_Z3_INTERFACES = False
-else:
-    _HAS_Z3_INTERFACES = True
 
+from zope.interface import Interface
+_HAS_Z3_INTERFACES = True
+
 class IPluginRegistry( Interface ):
 
 

Modified: Products.PluginRegistry/trunk/Products/PluginRegistry/tests/test_PluginRegistry.py
===================================================================
--- Products.PluginRegistry/trunk/Products/PluginRegistry/tests/test_PluginRegistry.py	2008-05-20 02:59:03 UTC (rev 86849)
+++ Products.PluginRegistry/trunk/Products/PluginRegistry/tests/test_PluginRegistry.py	2008-05-20 03:05:12 UTC (rev 86850)
@@ -15,11 +15,9 @@
 import unittest
 from OFS.Folder import Folder
 
-try:
-    from zope.interface import Interface
-except ImportError:  # Zope < 2.8.0
-    from Interface import Interface
 
+from zope.interface import Interface
+
 from Acquisition import Implicit
 
 from Products.PluginRegistry.utils import directlyProvides
@@ -62,10 +60,7 @@
         from Products.PluginRegistry.interfaces import IPluginRegistry
         from Products.PluginRegistry.interfaces import _HAS_Z3_INTERFACES
 
-        if _HAS_Z3_INTERFACES:
-            from zope.interface.verify import verifyClass
-        else:
-            from Interface.Verify import verifyClass
+        from zope.interface.verify import verifyClass
 
         verifyClass( IPluginRegistry, self._getTargetClass() )
 

Modified: Products.PluginRegistry/trunk/Products/PluginRegistry/utils.py
===================================================================
--- Products.PluginRegistry/trunk/Products/PluginRegistry/utils.py	2008-05-20 02:59:03 UTC (rev 86849)
+++ Products.PluginRegistry/trunk/Products/PluginRegistry/utils.py	2008-05-20 03:05:12 UTC (rev 86850)
@@ -17,14 +17,9 @@
 
 from Globals import package_home
 
-try:
-    from zope.interface import directlyProvides
-except ImportError:
-    def directlyProvides(obj, *interfaces):
-        obj.__implements__ = ( getattr( obj.__class__, '__implements__', () ) +
-                               tuple( interfaces )
-                             )
+from zope.interface import directlyProvides
 
+
 product_dir = package_home( globals() )
 product_prefix = os.path.join( os.path.split(product_dir)[:-1] )