[Checkins] SVN: BTrees/branches/py3k/ Coverage w/o extension modules bulit.
Tres Seaver
cvs-admin at zope.org
Wed Dec 12 14:40:54 UTC 2012
Log message for revision 128609:
Coverage w/o extension modules bulit.
Changed:
_U BTrees/branches/py3k/
U BTrees/branches/py3k/BTrees/IFBTree.py
U BTrees/branches/py3k/BTrees/IIBTree.py
U BTrees/branches/py3k/BTrees/IOBTree.py
U BTrees/branches/py3k/BTrees/LFBTree.py
U BTrees/branches/py3k/BTrees/LLBTree.py
U BTrees/branches/py3k/BTrees/LOBTree.py
U BTrees/branches/py3k/BTrees/OIBTree.py
U BTrees/branches/py3k/BTrees/OLBTree.py
U BTrees/branches/py3k/BTrees/OOBTree.py
U BTrees/branches/py3k/BTrees/fsBTree.py
-=-
Modified: BTrees/branches/py3k/BTrees/IFBTree.py
===================================================================
--- BTrees/branches/py3k/BTrees/IFBTree.py 2012-12-12 14:40:53 UTC (rev 128608)
+++ BTrees/branches/py3k/BTrees/IFBTree.py 2012-12-12 14:40:54 UTC (rev 128609)
@@ -100,16 +100,7 @@
try:
from _IFBTree import IFBucket
- 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 _OIBTree import weightedUnion
- from _OIBTree import weightedIntersection
-except ImportError: #pragma NO COVER
+except ImportError: #pragma NO COVER w/ C extensions
IFBucket = IFBucketPy
IFSet = IFSetPy
IFBTree = IFBTreePy
@@ -120,6 +111,16 @@
multiunion = multiunionPy
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
Bucket = IFBucket
Set = IFSet
Modified: BTrees/branches/py3k/BTrees/IIBTree.py
===================================================================
--- BTrees/branches/py3k/BTrees/IIBTree.py 2012-12-12 14:40:53 UTC (rev 128608)
+++ BTrees/branches/py3k/BTrees/IIBTree.py 2012-12-12 14:40:54 UTC (rev 128609)
@@ -101,16 +101,7 @@
try:
from _IIBTree import IIBucket
- 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
-except ImportError: #pragma NO COVER
+except ImportError: #pragma NO COVER w/ C extensions
IIBucket = IIBucketPy
IISet = IISetPy
IIBTree = IIBTreePy
@@ -121,6 +112,16 @@
multiunion = multiunionPy
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
Bucket = IIBucket
Set = IISet
Modified: BTrees/branches/py3k/BTrees/IOBTree.py
===================================================================
--- BTrees/branches/py3k/BTrees/IOBTree.py 2012-12-12 14:40:53 UTC (rev 128608)
+++ BTrees/branches/py3k/BTrees/IOBTree.py 2012-12-12 14:40:54 UTC (rev 128609)
@@ -84,14 +84,7 @@
try:
from _IOBTree import IOBucket
- 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
-except ImportError: #pragma NO COVER
+except ImportError: #pragma NO COVER w/ C extensions
IOBucket = IOBucketPy
IOSet = IOSetPy
IOBTree = IOBTreePy
@@ -100,6 +93,14 @@
union = unionPy
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
Bucket = IOBucket
Set = IOSet
Modified: BTrees/branches/py3k/BTrees/LFBTree.py
===================================================================
--- BTrees/branches/py3k/BTrees/LFBTree.py 2012-12-12 14:40:53 UTC (rev 128608)
+++ BTrees/branches/py3k/BTrees/LFBTree.py 2012-12-12 14:40:54 UTC (rev 128609)
@@ -101,16 +101,7 @@
try:
from _LFBTree import LFBucket
- 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 _OIBTree import weightedUnion
- from _OIBTree import weightedIntersection
-except ImportError: #pragma NO COVER
+except ImportError: #pragma NO COVER w/ C extensions
LFBucket = LFBucketPy
LFSet = LFSetPy
LFBTree = LFBTreePy
@@ -121,6 +112,16 @@
multiunion = multiunionPy
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
Bucket = LFBucket
Set = LFSet
Modified: BTrees/branches/py3k/BTrees/LLBTree.py
===================================================================
--- BTrees/branches/py3k/BTrees/LLBTree.py 2012-12-12 14:40:53 UTC (rev 128608)
+++ BTrees/branches/py3k/BTrees/LLBTree.py 2012-12-12 14:40:54 UTC (rev 128609)
@@ -101,16 +101,7 @@
try:
from _LLBTree import LLBucket
- 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
-except ImportError: #pragma NO COVER
+except ImportError: #pragma NO COVER w/ C extensions
LLBucket = LLBucketPy
LLSet = LLSetPy
LLBTree = LLBTreePy
@@ -121,6 +112,16 @@
multiunion = multiunionPy
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
Bucket = LLBucket
Set = LLSet
Modified: BTrees/branches/py3k/BTrees/LOBTree.py
===================================================================
--- BTrees/branches/py3k/BTrees/LOBTree.py 2012-12-12 14:40:53 UTC (rev 128608)
+++ BTrees/branches/py3k/BTrees/LOBTree.py 2012-12-12 14:40:54 UTC (rev 128609)
@@ -84,14 +84,7 @@
try:
from _LOBTree import LOBucket
- 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
-except ImportError: #pragma NO COVER
+except ImportError: #pragma NO COVER w/ C extensions
LOBucket = LOBucketPy
LOSet = LOSetPy
LOBTree = LOBTreePy
@@ -100,6 +93,14 @@
union = unionPy
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
Bucket = LOBucket
Set = LOSet
Modified: BTrees/branches/py3k/BTrees/OIBTree.py
===================================================================
--- BTrees/branches/py3k/BTrees/OIBTree.py 2012-12-12 14:40:53 UTC (rev 128608)
+++ BTrees/branches/py3k/BTrees/OIBTree.py 2012-12-12 14:40:54 UTC (rev 128609)
@@ -98,15 +98,7 @@
try:
from _OIBTree import OIBucket
- 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
-except ImportError: #pragma NO COVER
+except ImportError: #pragma NO COVER w/ C extensions
OIBucket = OIBucketPy
OISet = OISetPy
OIBTree = OIBTreePy
@@ -116,6 +108,15 @@
intersection = intersectionPy
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
Bucket = OIBucket
Modified: BTrees/branches/py3k/BTrees/OLBTree.py
===================================================================
--- BTrees/branches/py3k/BTrees/OLBTree.py 2012-12-12 14:40:53 UTC (rev 128608)
+++ BTrees/branches/py3k/BTrees/OLBTree.py 2012-12-12 14:40:54 UTC (rev 128609)
@@ -99,15 +99,7 @@
try:
from _OLBTree import OLBucket
- 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
-except ImportError: #pragma NO COVER
+except ImportError: #pragma NO COVER w/ C extensions
OLBucket = OLBucketPy
OLSet = OLSetPy
OLBTree = OLBTreePy
@@ -117,6 +109,15 @@
intersection = intersectionPy
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
Bucket = OLBucket
Set = OLSet
Modified: BTrees/branches/py3k/BTrees/OOBTree.py
===================================================================
--- BTrees/branches/py3k/BTrees/OOBTree.py 2012-12-12 14:40:53 UTC (rev 128608)
+++ BTrees/branches/py3k/BTrees/OOBTree.py 2012-12-12 14:40:54 UTC (rev 128609)
@@ -79,13 +79,7 @@
try:
from _OOBTree import OOBucket
- from _OOBTree import OOSet
- from _OOBTree import OOBTree
- from _OOBTree import OOTreeSet
- from _OOBTree import difference
- from _OOBTree import union
- from _OOBTree import intersection
-except ImportError: #pragma NO COVER
+except ImportError: #pragma NO COVER w/ C extensions
OOBucket = OOBucketPy
OOSet = OOSetPy
OOBTree = OOBTreePy
@@ -93,6 +87,13 @@
difference = differencePy
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
Bucket = OOBucket
Set = OOSet
Modified: BTrees/branches/py3k/BTrees/fsBTree.py
===================================================================
--- BTrees/branches/py3k/BTrees/fsBTree.py 2012-12-12 14:40:53 UTC (rev 128608)
+++ BTrees/branches/py3k/BTrees/fsBTree.py 2012-12-12 14:40:54 UTC (rev 128609)
@@ -17,7 +17,7 @@
__all__ = ('Bucket', 'Set', 'BTree', 'TreeSet',
'fsBucket', 'fsSet', 'fsBTree', 'fsTreeSet',
- 'union', 'intersection', 'difference', 'multiunion',
+ 'union', 'intersection', 'difference',
)
@@ -30,7 +30,6 @@
from ._base import TreeSet
from ._base import difference as _difference
from ._base import intersection as _intersection
-from ._base import multiunion as _multiunion
from ._base import set_operation as _set_operation
from ._base import to_str as _to_str
from ._base import union as _union
@@ -104,18 +103,10 @@
differencePy = _set_operation(_difference, fsSetPy)
unionPy = _set_operation(_union, fsSetPy)
intersectionPy = _set_operation(_intersection, fsSetPy)
-multiunionPy = _set_operation(_multiunion, fsSetPy)
try:
from _fsBTree import fsBucket
- 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 multiunion
-except ImportError: #pragma NO COVER
+except ImportError: #pragma NO COVER w/ C extensions
fsBucket = fsBucketPy
fsSet = fsSetPy
fsBTree = fsBTreePy
@@ -123,7 +114,13 @@
difference = differencePy
union = unionPy
intersection = intersectionPy
- multiunion = multiunionPy
+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
Bucket = fsBucket
Set = fsSet
More information about the checkins
mailing list