[Checkins] SVN: BTrees/branches/pure_python/ For the children:
Tres Seaver
cvs-admin at zope.org
Mon Nov 19 21:27:40 UTC 2012
Log message for revision 128363:
For the children:
s/setop/set_operation/g
Changed:
_U BTrees/branches/pure_python/
U BTrees/branches/pure_python/BTrees/IFBTree.py
U BTrees/branches/pure_python/BTrees/IIBTree.py
U BTrees/branches/pure_python/BTrees/IOBTree.py
U BTrees/branches/pure_python/BTrees/LFBTree.py
U BTrees/branches/pure_python/BTrees/LLBTree.py
U BTrees/branches/pure_python/BTrees/LOBTree.py
U BTrees/branches/pure_python/BTrees/OIBTree.py
U BTrees/branches/pure_python/BTrees/OLBTree.py
U BTrees/branches/pure_python/BTrees/OOBTree.py
U BTrees/branches/pure_python/BTrees/_base.py
U BTrees/branches/pure_python/BTrees/fsBTree.py
-=-
Modified: BTrees/branches/pure_python/BTrees/IFBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/IFBTree.py 2012-11-19 21:27:38 UTC (rev 128362)
+++ BTrees/branches/pure_python/BTrees/IFBTree.py 2012-11-19 21:27:39 UTC (rev 128363)
@@ -31,7 +31,7 @@
from ._base import difference as _difference
from ._base import intersection as _intersection
from ._base import multiunion as _multiunion
-from ._base import setop as _setop
+from ._base import set_operation as _set_operation
from ._base import to_int as _to_key
from ._base import to_float as _to_value
from ._base import union as _union
@@ -91,12 +91,12 @@
IFTreeSetPy._set_type = IFTreeSetPy._bucket_type = IFSetPy
-differencePy = _setop(_difference, IFSetPy)
-unionPy = _setop(_union, IFSetPy)
-intersectionPy = _setop(_intersection, IFSetPy)
-multiunionPy = _setop(_multiunion, IFSetPy)
-weightedUnionPy = _setop(_weightedUnion, IFSetPy)
-weightedIntersectionPy = _setop(_weightedIntersection, IFSetPy)
+differencePy = _set_operation(_difference, IFSetPy)
+unionPy = _set_operation(_union, IFSetPy)
+intersectionPy = _set_operation(_intersection, IFSetPy)
+multiunionPy = _set_operation(_multiunion, IFSetPy)
+weightedUnionPy = _set_operation(_weightedUnion, IFSetPy)
+weightedIntersectionPy = _set_operation(_weightedIntersection, IFSetPy)
try:
from _IFBTree import IFBucket
Modified: BTrees/branches/pure_python/BTrees/IIBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/IIBTree.py 2012-11-19 21:27:38 UTC (rev 128362)
+++ BTrees/branches/pure_python/BTrees/IIBTree.py 2012-11-19 21:27:39 UTC (rev 128363)
@@ -31,7 +31,7 @@
from ._base import difference as _difference
from ._base import intersection as _intersection
from ._base import multiunion as _multiunion
-from ._base import setop as _setop
+from ._base import set_operation as _set_operation
from ._base import to_int as _to_key
from ._base import to_int as _to_value
from ._base import union as _union
@@ -92,13 +92,13 @@
IITreeSetPy._set_type = IITreeSetPy._bucket_type = IISetPy
-differencePy = _setop(_difference, IISetPy)
-unionPy = _setop(_union, IISetPy)
-intersectionPy = _setop(_intersection, IISetPy)
-multiunionPy = _setop(_multiunion, IISetPy)
-weightedUnionPy = _setop(_weightedUnion, IISetPy)
+differencePy = _set_operation(_difference, IISetPy)
+unionPy = _set_operation(_union, IISetPy)
+intersectionPy = _set_operation(_intersection, IISetPy)
+multiunionPy = _set_operation(_multiunion, IISetPy)
+weightedUnionPy = _set_operation(_weightedUnion, IISetPy)
+weightedIntersectionPy = _set_operation(_weightedIntersection, IISetPy)
-weightedIntersectionPy = _setop(_weightedIntersection, IISetPy)
try:
from _IIBTree import IIBucket
from _IIBTree import IISet
Modified: BTrees/branches/pure_python/BTrees/IOBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/IOBTree.py 2012-11-19 21:27:38 UTC (rev 128362)
+++ BTrees/branches/pure_python/BTrees/IOBTree.py 2012-11-19 21:27:39 UTC (rev 128363)
@@ -28,7 +28,7 @@
from ._base import difference as _difference
from ._base import intersection as _intersection
from ._base import multiunion as _multiunion
-from ._base import setop as _setop
+from ._base import set_operation as _set_operation
from ._base import to_int as _to_key
from ._base import to_ob as _to_value
from ._base import union as _union
@@ -77,10 +77,10 @@
IOTreeSetPy._set_type = IOTreeSetPy._bucket_type = IOSetPy
-differencePy = _setop(_difference, IOSetPy)
-unionPy = _setop(_union, IOSetPy)
-intersectionPy = _setop(_intersection, IOSetPy)
-multiunionPy = _setop(_multiunion, IOSetPy)
+differencePy = _set_operation(_difference, IOSetPy)
+unionPy = _set_operation(_union, IOSetPy)
+intersectionPy = _set_operation(_intersection, IOSetPy)
+multiunionPy = _set_operation(_multiunion, IOSetPy)
try:
from _IOBTree import IOBucket
Modified: BTrees/branches/pure_python/BTrees/LFBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/LFBTree.py 2012-11-19 21:27:38 UTC (rev 128362)
+++ BTrees/branches/pure_python/BTrees/LFBTree.py 2012-11-19 21:27:39 UTC (rev 128363)
@@ -31,7 +31,7 @@
from ._base import difference as _difference
from ._base import intersection as _intersection
from ._base import multiunion as _multiunion
-from ._base import setop as _setop
+from ._base import set_operation as _set_operation
from ._base import to_long as _to_key
from ._base import to_float as _to_value
from ._base import union as _union
@@ -92,12 +92,12 @@
LFTreeSetPy._set_type = LFTreeSetPy._bucket_type = LFSetPy
-differencePy = _setop(_difference, LFSetPy)
-unionPy = _setop(_union, LFSetPy)
-intersectionPy = _setop(_intersection, LFSetPy)
-multiunionPy = _setop(_multiunion, LFSetPy)
-weightedUnionPy = _setop(_weightedUnion, LFSetPy)
-weightedIntersectionPy = _setop(_weightedIntersection, LFSetPy)
+differencePy = _set_operation(_difference, LFSetPy)
+unionPy = _set_operation(_union, LFSetPy)
+intersectionPy = _set_operation(_intersection, LFSetPy)
+multiunionPy = _set_operation(_multiunion, LFSetPy)
+weightedUnionPy = _set_operation(_weightedUnion, LFSetPy)
+weightedIntersectionPy = _set_operation(_weightedIntersection, LFSetPy)
try:
from _LFBTree import LFBucket
Modified: BTrees/branches/pure_python/BTrees/LLBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/LLBTree.py 2012-11-19 21:27:38 UTC (rev 128362)
+++ BTrees/branches/pure_python/BTrees/LLBTree.py 2012-11-19 21:27:39 UTC (rev 128363)
@@ -31,7 +31,7 @@
from ._base import difference as _difference
from ._base import intersection as _intersection
from ._base import multiunion as _multiunion
-from ._base import setop as _setop
+from ._base import set_operation as _set_operation
from ._base import to_long as _to_key
from ._base import to_long as _to_value
from ._base import union as _union
@@ -92,12 +92,12 @@
LLTreeSetPy._set_type = LLTreeSetPy._bucket_type = LLSetPy
-differencePy = _setop(_difference, LLSetPy)
-unionPy = _setop(_union, LLSetPy)
-intersectionPy = _setop(_intersection, LLSetPy)
-multiunionPy = _setop(_multiunion, LLSetPy)
-weightedUnionPy = _setop(_weightedUnion, LLSetPy)
-weightedIntersectionPy = _setop(_weightedIntersection, LLSetPy)
+differencePy = _set_operation(_difference, LLSetPy)
+unionPy = _set_operation(_union, LLSetPy)
+intersectionPy = _set_operation(_intersection, LLSetPy)
+multiunionPy = _set_operation(_multiunion, LLSetPy)
+weightedUnionPy = _set_operation(_weightedUnion, LLSetPy)
+weightedIntersectionPy = _set_operation(_weightedIntersection, LLSetPy)
try:
from _LLBTree import LLBucket
Modified: BTrees/branches/pure_python/BTrees/LOBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/LOBTree.py 2012-11-19 21:27:38 UTC (rev 128362)
+++ BTrees/branches/pure_python/BTrees/LOBTree.py 2012-11-19 21:27:39 UTC (rev 128363)
@@ -28,7 +28,7 @@
from ._base import difference as _difference
from ._base import intersection as _intersection
from ._base import multiunion as _multiunion
-from ._base import setop as _setop
+from ._base import set_operation as _set_operation
from ._base import to_long as _to_key
from ._base import to_ob as _to_value
from ._base import union as _union
@@ -77,10 +77,10 @@
LOTreeSetPy._set_type = LOTreeSetPy._bucket_type = LOSetPy
-differencePy = _setop(_difference, LOSetPy)
-unionPy = _setop(_union, LOSetPy)
-intersectionPy = _setop(_intersection, LOSetPy)
-multiunionPy = _setop(_multiunion, LOSetPy)
+differencePy = _set_operation(_difference, LOSetPy)
+unionPy = _set_operation(_union, LOSetPy)
+intersectionPy = _set_operation(_intersection, LOSetPy)
+multiunionPy = _set_operation(_multiunion, LOSetPy)
try:
from _LOBTree import LOBucket
Modified: BTrees/branches/pure_python/BTrees/OIBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/OIBTree.py 2012-11-19 21:27:38 UTC (rev 128362)
+++ BTrees/branches/pure_python/BTrees/OIBTree.py 2012-11-19 21:27:39 UTC (rev 128363)
@@ -30,7 +30,7 @@
from ._base import TreeSet
from ._base import difference as _difference
from ._base import intersection as _intersection
-from ._base import setop as _setop
+from ._base import set_operation as _set_operation
from ._base import to_ob as _to_key
from ._base import to_int as _to_value
from ._base import union as _union
@@ -90,11 +90,11 @@
OITreeSetPy._set_type = OITreeSetPy._bucket_type = OISetPy
-differencePy = _setop(_difference, OISetPy)
-unionPy = _setop(_union, OISetPy)
-intersectionPy = _setop(_intersection, OISetPy)
-weightedUnionPy = _setop(_weightedUnion, OISetPy)
-weightedIntersectionPy = _setop(_weightedIntersection, OISetPy)
+differencePy = _set_operation(_difference, OISetPy)
+unionPy = _set_operation(_union, OISetPy)
+intersectionPy = _set_operation(_intersection, OISetPy)
+weightedUnionPy = _set_operation(_weightedUnion, OISetPy)
+weightedIntersectionPy = _set_operation(_weightedIntersection, OISetPy)
try:
from _OIBTree import OIBucket
Modified: BTrees/branches/pure_python/BTrees/OLBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/OLBTree.py 2012-11-19 21:27:38 UTC (rev 128362)
+++ BTrees/branches/pure_python/BTrees/OLBTree.py 2012-11-19 21:27:39 UTC (rev 128363)
@@ -30,7 +30,7 @@
from ._base import TreeSet
from ._base import difference as _difference
from ._base import intersection as _intersection
-from ._base import setop as _setop
+from ._base import set_operation as _set_operation
from ._base import to_ob as _to_key
from ._base import to_int as _to_value
from ._base import union as _union
@@ -91,11 +91,11 @@
OLTreeSetPy._set_type = OLTreeSetPy._bucket_type = OLSetPy
-differencePy = _setop(_difference, OLSetPy)
-unionPy = _setop(_union, OLSetPy)
-intersectionPy = _setop(_intersection, OLSetPy)
-weightedUnionPy = _setop(_weightedUnion, OLSetPy)
-weightedIntersectionPy = _setop(_weightedIntersection, OLSetPy)
+differencePy = _set_operation(_difference, OLSetPy)
+unionPy = _set_operation(_union, OLSetPy)
+intersectionPy = _set_operation(_intersection, OLSetPy)
+weightedUnionPy = _set_operation(_weightedUnion, OLSetPy)
+weightedIntersectionPy = _set_operation(_weightedIntersection, OLSetPy)
try:
from _OLBTree import OLBucket
Modified: BTrees/branches/pure_python/BTrees/OOBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/OOBTree.py 2012-11-19 21:27:38 UTC (rev 128362)
+++ BTrees/branches/pure_python/BTrees/OOBTree.py 2012-11-19 21:27:39 UTC (rev 128363)
@@ -26,7 +26,7 @@
from ._base import TreeSet
from ._base import difference as _difference
from ._base import intersection as _intersection
-from ._base import setop as _setop
+from ._base import set_operation as _set_operation
from ._base import to_ob as _to_key
from ._base import to_ob as _to_value
from ._base import union as _union
@@ -78,9 +78,9 @@
OOTreeSetPy._set_type = OOTreeSetPy._bucket_type = OOSetPy
-differencePy = _setop(_difference, OOSetPy)
-unionPy = _setop(_union, OOSetPy)
-intersectionPy = _setop(_intersection, OOSetPy)
+differencePy = _set_operation(_difference, OOSetPy)
+unionPy = _set_operation(_union, OOSetPy)
+intersectionPy = _set_operation(_intersection, OOSetPy)
try:
from _OOBTree import OOBucket
Modified: BTrees/branches/pure_python/BTrees/_base.py
===================================================================
--- BTrees/branches/pure_python/BTrees/_base.py 2012-11-19 21:27:38 UTC (rev 128362)
+++ BTrees/branches/pure_python/BTrees/_base.py 2012-11-19 21:27:39 UTC (rev 128363)
@@ -1203,7 +1203,7 @@
return r
-class setop(object):
+class set_operation(object):
def __init__(self, func, set_type):
self.func = func
Modified: BTrees/branches/pure_python/BTrees/fsBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/fsBTree.py 2012-11-19 21:27:38 UTC (rev 128362)
+++ BTrees/branches/pure_python/BTrees/fsBTree.py 2012-11-19 21:27:39 UTC (rev 128363)
@@ -31,7 +31,7 @@
from ._base import difference as _difference
from ._base import intersection as _intersection
from ._base import multiunion as _multiunion
-from ._base import setop as _setop
+from ._base import set_operation as _set_operation
from ._base import to_str as _to_str
from ._base import union as _union
@@ -101,10 +101,10 @@
fsTreeSetPy._set_type = fsTreeSetPy._bucket_type = fsSetPy
-differencePy = _setop(_difference, fsSetPy)
-unionPy = _setop(_union, fsSetPy)
-intersectionPy = _setop(_intersection, fsSetPy)
-multiunionPy = _setop(_multiunion, fsSetPy)
+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
More information about the checkins
mailing list