[Zodb-checkins] CVS: Zope/lib/python/BTrees - check.py:1.1.4.4

Tim Peters tim.one at comcast.net
Wed Jun 11 15:18:28 EDT 2003


Update of /cvs-repository/Zope/lib/python/BTrees
In directory cvs.zope.org:/tmp/cvs-serv30002/lib/python/BTrees

Modified Files:
      Tag: Zope-2_6-branch
	check.py 
Log Message:
Don't even think about trying to import Zope3 objects.


=== Zope/lib/python/BTrees/check.py 1.1.4.3 => 1.1.4.4 ===
--- Zope/lib/python/BTrees/check.py:1.1.4.3	Wed Jan 15 13:05:59 2003
+++ Zope/lib/python/BTrees/check.py	Wed Jun 11 14:18:27 2003
@@ -34,16 +34,10 @@
 
 from types import TupleType
 
-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 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
 
 TYPE_UNKNOWN, TYPE_BTREE, TYPE_BUCKET = range(3)
 




More information about the Zodb-checkins mailing list