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

[Laurence Rowe]

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

Changed:
  U   Products.ZopeVersionControl/trunk/CHANGES.txt
  U   Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/IVersionControl.py
  U   Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/nonversioned.py

-=-
Modified: Products.ZopeVersionControl/trunk/CHANGES.txt
===================================================================
--- Products.ZopeVersionControl/trunk/CHANGES.txt	2008-05-20 01:08:43 UTC (rev 86848)
+++ Products.ZopeVersionControl/trunk/CHANGES.txt	2008-05-20 02:59:03 UTC (rev 86849)
@@ -4,6 +4,7 @@
 1.0a2 (unreleased)
 ------------------
 
+    - Purge old zope2 Interface interfaces for Zope 2.12 compatibility.
 
 1.0a1 (2008/05/03)
 ------------------

Modified: Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/IVersionControl.py
===================================================================
--- Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/IVersionControl.py	2008-05-20 01:08:43 UTC (rev 86848)
+++ Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/IVersionControl.py	2008-05-20 02:59:03 UTC (rev 86849)
@@ -13,7 +13,7 @@
 
 __version__='$Revision: 1.7 $'[11:-2]
 
-from Interface import Interface
+from zope.interface import Interface
 
 
 class IVersionControl(Interface):

Modified: Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/nonversioned.py
===================================================================
--- Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/nonversioned.py	2008-05-20 01:08:43 UTC (rev 86848)
+++ Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/nonversioned.py	2008-05-20 02:59:03 UTC (rev 86849)
@@ -20,6 +20,7 @@
 
 from IVersionControl import INonVersionedData
 from VersionSupport import isAVersionableResource
+from zope.interface import implements
 
 
 try:
@@ -45,7 +46,7 @@
     base = aq_base(obj)
     # If the object implements INonVersionedData, let it say
     # what its items are.
-    if INonVersionedData.isImplementedBy(base):
+    if INonVersionedData.providedBy(base):
         return obj
     # If the object is an ObjectManager, use the ObjectManager adapter.
     try:
@@ -78,7 +79,7 @@
 class StandardNonVersionedDataAdapter:
     """Non-versioned data adapter for arbitrary things.
     """
-    __implements__ = INonVersionedData
+    implements(INonVersionedData)
 
     def __init__(self, obj):
         self.obj = obj
@@ -114,7 +115,7 @@
 class ObjectManagerNonVersionedDataAdapter(StandardNonVersionedDataAdapter):
     """Non-versioned data adapter for object managers.
     """
-    __implements__ = INonVersionedData
+    implements(INonVersionedData)
 
     def listNonVersionedObjects(self):
         contents = self.getNonVersionedData()['contents']