Merge r121798 from /ZODB/branches/jim-python-btrees.

Tests still don't pass. :(

BTrees/IFBTree.py

@@ -16,6 +16,11 @@ import zope.interface
 import BTrees.Interfaces
 
 # hack to overcome dynamic-linking headache.
-from _IFBTree import *
+try:
+    from _IFBTree import *
+except ImportError:
+    import ___BTree
+    ___BTree._import(globals(), 'IF', 120, 500)
+
 
 zope.interface.moduleProvides(BTrees.Interfaces.IIntegerFloatBTreeModule)

BTrees/IIBTree.py

@@ -16,6 +16,10 @@ import zope.interface
 import BTrees.Interfaces
 
 # hack to overcome dynamic-linking headache.
-from _IIBTree import *
+try:
+    from _IIBTree import *
+except ImportError:
+    import ___BTree
+    ___BTree._import(globals(), 'II', 120, 500)
 
 zope.interface.moduleProvides(BTrees.Interfaces.IIntegerIntegerBTreeModule)

BTrees/IOBTree.py

@@ -16,6 +16,10 @@ import zope.interface
 import BTrees.Interfaces
 
 # hack to overcome dynamic-linking headache.
-from _IOBTree import *
+try:
+    from _IOBTree import *
+except ImportError:
+    import ___BTree
+    ___BTree._import(globals(), 'IO', 60, 500)
 
 zope.interface.moduleProvides(BTrees.Interfaces.IIntegerObjectBTreeModule)

BTrees/LFBTree.py

@@ -15,7 +15,10 @@
 import zope.interface
 import BTrees.Interfaces
 
-# hack to overcome dynamic-linking headache.
-from _LFBTree import *
+try:
+    from _LFBTree import *
+except ImportError:
+    import ___BTree
+    ___BTree._import(globals(), 'LF', 120, 500)
 
 zope.interface.moduleProvides(BTrees.Interfaces.IIntegerFloatBTreeModule)

BTrees/LLBTree.py

@@ -15,7 +15,10 @@
 import zope.interface
 import BTrees.Interfaces
 
-# hack to overcome dynamic-linking headache.
-from _LLBTree import *
+try:
+    from _LLBTree import *
+except ImportError:
+    import ___BTree
+    ___BTree._import(globals(), 'LL', 120, 500)
 
 zope.interface.moduleProvides(BTrees.Interfaces.IIntegerIntegerBTreeModule)

BTrees/LOBTree.py

@@ -16,6 +16,10 @@ import zope.interface
 import BTrees.Interfaces
 
 # hack to overcome dynamic-linking headache.
-from _LOBTree import *
+try:
+    from _LOBTree import *
+except ImportError:
+    import ___BTree
+    ___BTree._import(globals(), 'LO', 60, 500)
 
 zope.interface.moduleProvides(BTrees.Interfaces.IIntegerObjectBTreeModule)

BTrees/OIBTree.py

@@ -16,6 +16,10 @@ import zope.interface
 import BTrees.Interfaces
 
 # hack to overcome dynamic-linking headache.
-from _OIBTree import *
+try:
+    from _OIBTree import *
+except ImportError:
+    import ___BTree
+    ___BTree._import(globals(), 'OI', 60, 250)
 
 zope.interface.moduleProvides(BTrees.Interfaces.IObjectIntegerBTreeModule)

BTrees/OLBTree.py

@@ -16,6 +16,10 @@ import zope.interface
 import BTrees.Interfaces
 
 # hack to overcome dynamic-linking headache.
-from _OLBTree import *
+try:
+    from _OLBTree import *
+except ImportError:
+    import ___BTree
+    ___BTree._import(globals(), 'OL', 60, 250)
 
 zope.interface.moduleProvides(BTrees.Interfaces.IObjectIntegerBTreeModule)

BTrees/OOBTree.py

@@ -15,32 +15,10 @@
 import zope.interface
 import BTrees.Interfaces
 
-# hack to overcome dynamic-linking headache.
 try:
     from _OOBTree import *
 except ImportError:
-
     import ___BTree
-
-    class _Base:
-        pass
-
-    class OOBucket(___BTree.Bucket, _Base):
-        MAX_SIZE = 30
-
-    _Base._mapping_type = OOBucket
-
-    class OOSet(___BTree.Set, _Base)):
-        MAX_SIZE = 30
-
-    _Base._set_type = OOSet
-
-    class OOBTree(___BTree.BTree, _Base)):
-        _bucket_type = OOBucket
-        MAX_SIZE = 250
-
-    class OOBTreeSet(___BTree.BTree, _Base)):
-        _bucket_type = OOSet
-        MAX_SIZE = 250
+    ___BTree._import(globals(), 'OO', 30, 250)
 
 zope.interface.moduleProvides(BTrees.Interfaces.IObjectObjectBTreeModule)

BTrees/fsBTree.py

@@ -16,4 +16,11 @@
 # expected to be "public" excpect to FileStorage.
 
 # hack to overcome dynamic-linking headache.
-from _fsBTree import *
+try:
+    from _fsBTree import *
+except ImportError:
+    import ___BTree
+    ___BTree._import(globals(), 'fs', 500, 500,
+                     to_key=___BTree.to_str(2),
+                     to_value=___BTree.to_str(6),
+                     )