[Zodb-checkins] SVN: ZODB/trunk/src/ If we're depending on zope.interface now, go all the way.

[Tim Peters]

Log message for revision 25941:
If we're depending on zope.interface now, go all the way.



-=-
Modified: ZODB/trunk/src/BTrees/Interfaces.py
===================================================================
--- ZODB/trunk/src/BTrees/Interfaces.py	2004-06-22 17:43:52 UTC (rev 25940)
+++ ZODB/trunk/src/BTrees/Interfaces.py	2004-06-22 18:08:24 UTC (rev 25941)
@@ -12,8 +12,7 @@
 #
 ##############################################################################
 
-import OOBTree, Interface
-from Interface import Interface
+from zope.interface import Interface
 
 class ICollection(Interface):
 
@@ -390,11 +389,3 @@
 # 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

Modified: ZODB/trunk/src/persistent/interfaces.py
===================================================================
--- ZODB/trunk/src/persistent/interfaces.py	2004-06-22 17:43:52 UTC (rev 25940)
+++ ZODB/trunk/src/persistent/interfaces.py	2004-06-22 18:08:24 UTC (rev 25941)
@@ -15,19 +15,10 @@
 
 $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
+from zope.interface import Interface
+from zope.interface import Attribute
 
-    class Interface(object):
-        pass
-
-    def Attribute(s):
-        return s
-
 class IPersistent(Interface):
     """Python persistent interface
 

Modified: ZODB/trunk/src/transaction/interfaces.py
===================================================================
--- ZODB/trunk/src/transaction/interfaces.py	2004-06-22 17:43:52 UTC (rev 25940)
+++ ZODB/trunk/src/transaction/interfaces.py	2004-06-22 18:08:24 UTC (rev 25941)
@@ -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