Move zope 3 interfaces to new file. Old zope 2 interfaces were only u…

…sed internally, so just remove them

CHANGES.txt

@@ -5,6 +5,7 @@ Changelog
 ------------------
 
     - Purge old zope2 Interface interfaces for Zope 2.12 compatibility.
+      Note that they are internal to the implementation of this module.
 
 1.0a1 (2008/05/03)
 ------------------

Products/ZopeVersionControl/nonversioned.py

@@ -18,7 +18,7 @@
 from Acquisition import aq_base
 from OFS.ObjectManager import ObjectManager
 
-from IVersionControl import INonVersionedData
+from interfaces import INonVersionedData
 from VersionSupport import isAVersionableResource
 from zope.interface import implements
 
@@ -49,15 +49,8 @@ def getNonVersionedDataAdapter(obj):
     if INonVersionedData.providedBy(base):
         return obj
     # If the object is an ObjectManager, use the ObjectManager adapter.
-    try:
-        is_obj_mgr = isinstance(base, ObjectManager)
-    except TypeError:
-        # Python 2.1 isinstance() dislikes ExtensionClass instances.
-        # This is an adequate workaround.
-        pass
-    else:
-        if is_obj_mgr:
-            return ObjectManagerNonVersionedDataAdapter(obj)
+    if isinstance(base, ObjectManager):
+        return ObjectManagerNonVersionedDataAdapter(obj)
     # Otherwise use the standard adapter.
     return StandardNonVersionedDataAdapter(obj)