Commit 6016bee6 authored by Tim Peters's avatar Tim Peters

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

parent ced1bcbf
......@@ -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
......@@ -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
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment