Zap relative imports from C extensions.

BTrees/IFBTree.py

@@ -99,7 +99,7 @@ weightedUnionPy = _set_operation(_weightedUnion, IFSetPy)
 weightedIntersectionPy = _set_operation(_weightedIntersection, IFSetPy)
 
 try:
-    from _IFBTree import IFBucket
+    from ._IFBTree import IFBucket
 except ImportError: #pragma NO COVER w/ C extensions
     IFBucket = IFBucketPy
     IFSet = IFSetPy
@@ -112,15 +112,15 @@ except ImportError: #pragma NO COVER w/ C extensions
     weightedUnion = weightedUnionPy
     weightedIntersection = weightedIntersectionPy
 else: #pragma NO COVER w/o C extensions
-    from _IFBTree import IFSet
-    from _IFBTree import IFBTree
-    from _IFBTree import IFTreeSet
-    from _IFBTree import difference
-    from _IFBTree import union
-    from _IFBTree import intersection
-    from _IFBTree import multiunion
-    from _IFBTree import weightedUnion
-    from _IFBTree import weightedIntersection
+    from ._IFBTree import IFSet
+    from ._IFBTree import IFBTree
+    from ._IFBTree import IFTreeSet
+    from ._IFBTree import difference
+    from ._IFBTree import union
+    from ._IFBTree import intersection
+    from ._IFBTree import multiunion
+    from ._IFBTree import weightedUnion
+    from ._IFBTree import weightedIntersection
 
 Bucket = IFBucket
 Set = IFSet

BTrees/IIBTree.py

@@ -100,7 +100,7 @@ weightedUnionPy = _set_operation(_weightedUnion, IISetPy)
 weightedIntersectionPy = _set_operation(_weightedIntersection, IISetPy)
 
 try:
-    from _IIBTree import IIBucket
+    from ._IIBTree import IIBucket
 except ImportError: #pragma NO COVER w/ C extensions
     IIBucket = IIBucketPy
     IISet = IISetPy
@@ -113,15 +113,15 @@ except ImportError: #pragma NO COVER w/ C extensions
     weightedUnion = weightedUnionPy
     weightedIntersection = weightedIntersectionPy
 else: #pragma NO COVER w/o C extensions
-    from _IIBTree import IISet
-    from _IIBTree import IIBTree
-    from _IIBTree import IITreeSet
-    from _IIBTree import difference
-    from _IIBTree import union
-    from _IIBTree import intersection
-    from _IIBTree import multiunion
-    from _IIBTree import weightedUnion
-    from _IIBTree import weightedIntersection
+    from ._IIBTree import IISet
+    from ._IIBTree import IIBTree
+    from ._IIBTree import IITreeSet
+    from ._IIBTree import difference
+    from ._IIBTree import union
+    from ._IIBTree import intersection
+    from ._IIBTree import multiunion
+    from ._IIBTree import weightedUnion
+    from ._IIBTree import weightedIntersection
 
 Bucket = IIBucket
 Set = IISet

BTrees/IOBTree.py

@@ -83,7 +83,7 @@ intersectionPy = _set_operation(_intersection, IOSetPy)
 multiunionPy = _set_operation(_multiunion, IOSetPy)
 
 try:
-    from _IOBTree import IOBucket
+    from ._IOBTree import IOBucket
 except ImportError: #pragma NO COVER w/ C extensions
     IOBucket = IOBucketPy
     IOSet = IOSetPy
@@ -94,13 +94,13 @@ except ImportError: #pragma NO COVER w/ C extensions
     intersection = intersectionPy
     multiunion = multiunionPy
 else: #pragma NO COVER w/o C extensions
-    from _IOBTree import IOSet
-    from _IOBTree import IOBTree
-    from _IOBTree import IOTreeSet
-    from _IOBTree import difference
-    from _IOBTree import union
-    from _IOBTree import intersection
-    from _IOBTree import multiunion
+    from ._IOBTree import IOSet
+    from ._IOBTree import IOBTree
+    from ._IOBTree import IOTreeSet
+    from ._IOBTree import difference
+    from ._IOBTree import union
+    from ._IOBTree import intersection
+    from ._IOBTree import multiunion
 
 Bucket = IOBucket
 Set = IOSet

BTrees/LFBTree.py

@@ -100,7 +100,7 @@ weightedUnionPy = _set_operation(_weightedUnion, LFSetPy)
 weightedIntersectionPy = _set_operation(_weightedIntersection, LFSetPy)
 
 try:
-    from _LFBTree import LFBucket
+    from ._LFBTree import LFBucket
 except ImportError: #pragma NO COVER w/ C extensions
     LFBucket = LFBucketPy
     LFSet = LFSetPy
@@ -113,15 +113,15 @@ except ImportError: #pragma NO COVER w/ C extensions
     weightedUnion = weightedUnionPy
     weightedIntersection = weightedIntersectionPy
 else: #pragma NO COVER w/o C extensions
-    from _LFBTree import LFSet
-    from _LFBTree import LFBTree
-    from _LFBTree import LFTreeSet
-    from _LFBTree import difference
-    from _LFBTree import union
-    from _LFBTree import intersection
-    from _LFBTree import multiunion
-    from _LFBTree import weightedUnion
-    from _LFBTree import weightedIntersection
+    from ._LFBTree import LFSet
+    from ._LFBTree import LFBTree
+    from ._LFBTree import LFTreeSet
+    from ._LFBTree import difference
+    from ._LFBTree import union
+    from ._LFBTree import intersection
+    from ._LFBTree import multiunion
+    from ._LFBTree import weightedUnion
+    from ._LFBTree import weightedIntersection
 
 Bucket = LFBucket
 Set = LFSet

BTrees/LLBTree.py

@@ -100,7 +100,7 @@ weightedUnionPy = _set_operation(_weightedUnion, LLSetPy)
 weightedIntersectionPy = _set_operation(_weightedIntersection, LLSetPy)
 
 try:
-    from _LLBTree import LLBucket
+    from ._LLBTree import LLBucket
 except ImportError: #pragma NO COVER w/ C extensions
     LLBucket = LLBucketPy
     LLSet = LLSetPy
@@ -113,15 +113,15 @@ except ImportError: #pragma NO COVER w/ C extensions
     weightedUnion = weightedUnionPy
     weightedIntersection = weightedIntersectionPy
 else: #pragma NO COVER w/o C extensions
-    from _LLBTree import LLSet
-    from _LLBTree import LLBTree
-    from _LLBTree import LLTreeSet
-    from _LLBTree import difference
-    from _LLBTree import union
-    from _LLBTree import intersection
-    from _LLBTree import multiunion
-    from _LLBTree import weightedUnion
-    from _LLBTree import weightedIntersection
+    from ._LLBTree import LLSet
+    from ._LLBTree import LLBTree
+    from ._LLBTree import LLTreeSet
+    from ._LLBTree import difference
+    from ._LLBTree import union
+    from ._LLBTree import intersection
+    from ._LLBTree import multiunion
+    from ._LLBTree import weightedUnion
+    from ._LLBTree import weightedIntersection
 
 Bucket = LLBucket
 Set = LLSet

BTrees/LOBTree.py

@@ -83,7 +83,7 @@ intersectionPy = _set_operation(_intersection, LOSetPy)
 multiunionPy = _set_operation(_multiunion, LOSetPy)
 
 try:
-    from _LOBTree import LOBucket
+    from ._LOBTree import LOBucket
 except ImportError: #pragma NO COVER w/ C extensions
     LOBucket = LOBucketPy
     LOSet = LOSetPy
@@ -94,13 +94,13 @@ except ImportError: #pragma NO COVER w/ C extensions
     intersection = intersectionPy
     multiunion = multiunionPy
 else: #pragma NO COVER w/o C extensions
-    from _LOBTree import LOSet
-    from _LOBTree import LOBTree
-    from _LOBTree import LOTreeSet
-    from _LOBTree import difference
-    from _LOBTree import union
-    from _LOBTree import intersection
-    from _LOBTree import multiunion
+    from ._LOBTree import LOSet
+    from ._LOBTree import LOBTree
+    from ._LOBTree import LOTreeSet
+    from ._LOBTree import difference
+    from ._LOBTree import union
+    from ._LOBTree import intersection
+    from ._LOBTree import multiunion
 
 Bucket = LOBucket
 Set = LOSet

BTrees/OIBTree.py

@@ -97,7 +97,7 @@ weightedUnionPy = _set_operation(_weightedUnion, OISetPy)
 weightedIntersectionPy = _set_operation(_weightedIntersection, OISetPy)
 
 try:
-    from _OIBTree import OIBucket
+    from ._OIBTree import OIBucket
 except ImportError: #pragma NO COVER w/ C extensions
     OIBucket = OIBucketPy
     OISet = OISetPy
@@ -109,14 +109,14 @@ except ImportError: #pragma NO COVER w/ C extensions
     weightedUnion = weightedUnionPy
     weightedIntersection = weightedIntersectionPy
 else: #pragma NO COVER w/o C extensions
-    from _OIBTree import OISet
-    from _OIBTree import OIBTree
-    from _OIBTree import OITreeSet
-    from _OIBTree import difference
-    from _OIBTree import union
-    from _OIBTree import intersection
-    from _OIBTree import weightedUnion
-    from _OIBTree import weightedIntersection
+    from ._OIBTree import OISet
+    from ._OIBTree import OIBTree
+    from ._OIBTree import OITreeSet
+    from ._OIBTree import difference
+    from ._OIBTree import union
+    from ._OIBTree import intersection
+    from ._OIBTree import weightedUnion
+    from ._OIBTree import weightedIntersection
 
 
 Bucket = OIBucket

BTrees/OLBTree.py

@@ -98,7 +98,7 @@ weightedUnionPy = _set_operation(_weightedUnion, OLSetPy)
 weightedIntersectionPy = _set_operation(_weightedIntersection, OLSetPy)
 
 try:
-    from _OLBTree import OLBucket
+    from ._OLBTree import OLBucket
 except ImportError: #pragma NO COVER w/ C extensions
     OLBucket = OLBucketPy
     OLSet = OLSetPy
@@ -110,14 +110,14 @@ except ImportError: #pragma NO COVER w/ C extensions
     weightedUnion = weightedUnionPy
     weightedIntersection = weightedIntersectionPy
 else: #pragma NO COVER w/o C extensions
-    from _OLBTree import OLSet
-    from _OLBTree import OLBTree
-    from _OLBTree import OLTreeSet
-    from _OLBTree import difference
-    from _OLBTree import union
-    from _OLBTree import intersection
-    from _OLBTree import weightedUnion
-    from _OLBTree import weightedIntersection
+    from ._OLBTree import OLSet
+    from ._OLBTree import OLBTree
+    from ._OLBTree import OLTreeSet
+    from ._OLBTree import difference
+    from ._OLBTree import union
+    from ._OLBTree import intersection
+    from ._OLBTree import weightedUnion
+    from ._OLBTree import weightedIntersection
 
 Bucket = OLBucket
 Set = OLSet

BTrees/OOBTree.py

@@ -78,8 +78,8 @@ unionPy = _set_operation(_union, OOSetPy)
 intersectionPy = _set_operation(_intersection, OOSetPy)
 
 try:
-    from _OOBTree import OOBucket
-except ImportError: #pragma NO COVER w/ C extensions
+    from ._OOBTree import OOBucket
+except ImportError as e: #pragma NO COVER w/ C extensions
     OOBucket = OOBucketPy
     OOSet = OOSetPy
     OOBTree = OOBTreePy
@@ -88,12 +88,12 @@ except ImportError: #pragma NO COVER w/ C extensions
     union = unionPy
     intersection = intersectionPy
 else: #pragma NO COVER w/o C extensions
-    from _OOBTree import OOSet
-    from _OOBTree import OOBTree
-    from _OOBTree import OOTreeSet
-    from _OOBTree import difference
-    from _OOBTree import union
-    from _OOBTree import intersection
+    from ._OOBTree import OOSet
+    from ._OOBTree import OOBTree
+    from ._OOBTree import OOTreeSet
+    from ._OOBTree import difference
+    from ._OOBTree import union
+    from ._OOBTree import intersection
 
 Bucket = OOBucket
 Set = OOSet

BTrees/fsBTree.py

@@ -100,7 +100,7 @@ unionPy = _set_operation(_union, fsSetPy)
 intersectionPy = _set_operation(_intersection, fsSetPy)
 
 try:
-    from _fsBTree import fsBucket
+    from ._fsBTree import fsBucket
 except ImportError: #pragma NO COVER w/ C extensions
     fsBucket = fsBucketPy
     fsSet = fsSetPy
@@ -110,12 +110,12 @@ except ImportError: #pragma NO COVER w/ C extensions
     union = unionPy
     intersection = intersectionPy
 else: #pragma NO COVER w/o C extensions
-    from _fsBTree import fsSet
-    from _fsBTree import fsBTree
-    from _fsBTree import fsTreeSet
-    from _fsBTree import difference
-    from _fsBTree import union
-    from _fsBTree import intersection
+    from ._fsBTree import fsSet
+    from ._fsBTree import fsBTree
+    from ._fsBTree import fsTreeSet
+    from ._fsBTree import difference
+    from ._fsBTree import union
+    from ._fsBTree import intersection
 
 Bucket = fsBucket
 Set = fsSet