If we're depending on zope.interface now, go all the way.

src/BTrees/Interfaces.py

@@ -12,8 +12,7 @@
 #
 ##############################################################################
 
-import OOBTree, Interface
-from Interface import Interface
+from zope.interface import Interface
 
 class ICollection(Interface):
 
@@ -390,11 +389,3 @@ class IMergeIntegerKey(IMerge):
 # Eventually, I need to express this through the interfaces.
 #
 ################################################################
-
-# XXX Need to use the new declaration syntax once it is available
-# for Zope 2.
-
-## OOBTree.OOSet.__implements__=ISet
-## OOBTree.OOTreeSet.__implements__=ITreeSet
-## OOBTree.OOBucket.__implements__=IDictionaryIsh
-## OOBTree.OOBTree.__implements__=IBTree

src/persistent/interfaces.py

@@ -15,18 +15,9 @@
 
 $Id$
 """
-try:
-    from zope.interface import Interface
-    from zope.interface import Attribute
-except ImportError:
 
-    # just allow the module to compile if zope isn't available
-
-    class Interface(object):
-        pass
-
-    def Attribute(s):
-        return s
+from zope.interface import Interface
+from zope.interface import Attribute
 
 class IPersistent(Interface):
     """Python persistent interface

src/transaction/interfaces.py

@@ -15,12 +15,8 @@
 
 $Id$
 """
-try:
-    from zope.interface import Interface
-except ImportError:
-    class Interface:
-        pass
 
+from zope.interface import Interface
 
 class IDataManager(Interface):
     """Data management interface for storing objects transactionally