Commit c923e234 authored by Tim Peters's avatar Tim Peters

Don't even think about trying to import Zope3 versions of objects.

parent 4d149fb5
...@@ -34,16 +34,10 @@ that doesn't exist in the actual BTree). ...@@ -34,16 +34,10 @@ that doesn't exist in the actual BTree).
from types import TupleType from types import TupleType
try: from BTrees.OOBTree import OOBTree, OOBucket, OOSet, OOTreeSet
from zodb.btrees.OOBTree import OOBTree, OOBucket, OOSet, OOTreeSet from BTrees.OIBTree import OIBTree, OIBucket, OISet, OITreeSet
from zodb.btrees.OIBTree import OIBTree, OIBucket, OISet, OITreeSet from BTrees.IOBTree import IOBTree, IOBucket, IOSet, IOTreeSet
from zodb.btrees.IOBTree import IOBTree, IOBucket, IOSet, IOTreeSet from BTrees.IIBTree import IIBTree, IIBucket, IISet, IITreeSet
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
TYPE_UNKNOWN, TYPE_BTREE, TYPE_BUCKET = range(3) TYPE_UNKNOWN, TYPE_BTREE, TYPE_BUCKET = range(3)
......
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