[Zodb-checkins] CVS: Zope3/src/zodb/btrees - check.py:1.3.2.1 interfaces.py:1.9.22.1

[Grégoire Weber]

Update of /cvs-repository/Zope3/src/zodb/btrees
In directory cvs.zope.org:/tmp/cvs-serv24874/src/zodb/btrees

Modified Files:
      Tag: cw-mail-branch
	check.py interfaces.py 
Log Message:
Synced up with HEAD

=== Zope3/src/zodb/btrees/check.py 1.3 => 1.3.2.1 ===
--- Zope3/src/zodb/btrees/check.py:1.3	Tue May 20 15:07:23 2003
+++ Zope3/src/zodb/btrees/check.py	Sun Jun 22 10:22:27 2003
@@ -32,16 +32,10 @@
 that doesn't exist in the actual BTree).
 """
 
-try:
-    from zodb.btrees.OOBTree import OOBTree, OOBucket, OOSet, OOTreeSet
-    from zodb.btrees.OIBTree import OIBTree, OIBucket, OISet, OITreeSet
-    from zodb.btrees.IOBTree import IOBTree, IOBucket, IOSet, IOTreeSet
-    from zodb.btrees.IIBTree import IIBTree, IIBucket, IISet, IITreeSet
-except ImportError:
-    from BTrees.OOBTree import OOBTree, OOBucket, OOSet, OOTreeSet
-    from BTrees.OIBTree import OIBTree, OIBucket, OISet, OITreeSet
-    from BTrees.IOBTree import IOBTree, IOBucket, IOSet, IOTreeSet
-    from BTrees.IIBTree import IIBTree, IIBucket, IISet, IITreeSet
+from zodb.btrees.OOBTree import OOBTree, OOBucket, OOSet, OOTreeSet
+from zodb.btrees.OIBTree import OIBTree, OIBucket, OISet, OITreeSet
+from zodb.btrees.IOBTree import IOBTree, IOBucket, IOSet, IOTreeSet
+from zodb.btrees.IIBTree import IIBTree, IIBucket, IISet, IITreeSet
 
 TYPE_UNKNOWN, TYPE_BTREE, TYPE_BUCKET = range(3)
 


=== Zope3/src/zodb/btrees/interfaces.py 1.9 => 1.9.22.1 ===
--- Zope3/src/zodb/btrees/interfaces.py:1.9	Tue Mar  4 16:06:39 2003
+++ Zope3/src/zodb/btrees/interfaces.py	Sun Jun 22 10:22:27 2003
@@ -391,7 +391,8 @@
 # XXX You can't import OOBTree in this module, because it would create
 # a circular reference.
 
-# OOBTree.OOSet.__implements__ = ISet
-# OOBTree.OOTreeSet.__implements__ = ITreeSet
-# OOBTree.OOBucket.__implements__ = IDictionaryIsh
-# OOBTree.OOBTree.__implements__ = IBTree
+# from zope.interface import classImplements
+# classImplements(OOBTree.OOSet, ISet)
+# classImplements(OOBTree.OOTreeSet, ITreeSet)
+# classImplements(OOBTree.OOBucket, IDictionaryIsh)
+# classImplements(OOBTree.OOBTree, IBTree)