[Zope3-checkins] CVS: Zope3/src/zodb/btrees - check.py:1.4

Tim Peters tim.one@comcast.net
Wed, 11 Jun 2003 14:38:46 -0400


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

Modified Files:
	check.py 
Log Message:
Don't even think about trying to import Zope2 versions of objects.


=== Zope3/src/zodb/btrees/check.py 1.3 => 1.4 ===
--- Zope3/src/zodb/btrees/check.py:1.3	Tue May 20 15:07:23 2003
+++ Zope3/src/zodb/btrees/check.py	Wed Jun 11 14:38:45 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)