[Checkins] SVN: BTrees/branches/pure_python/ Fix conditional imports horked during unwind.

[Tres Seaver]

Log message for revision 128209:
  Fix conditional imports horked during unwind.

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/LFBTree.py
  U   BTrees/branches/pure_python/BTrees/LLBTree.py
  U   BTrees/branches/pure_python/BTrees/OLBTree.py

-=-
Modified: BTrees/branches/pure_python/BTrees/IFBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/IFBTree.py	2012-11-09 06:36:27 UTC (rev 128208)
+++ BTrees/branches/pure_python/BTrees/IFBTree.py	2012-11-09 06:36:28 UTC (rev 128209)
@@ -137,7 +137,7 @@
 
 weightedUnionPy = _setop(_weightedUnion, IFSetPy)
 try:
-    from _OIBTree import union
+    from _OIBTree import weightedUnion
 except ImportError:
     weightedUnion = weightedUnionPy
 

Modified: BTrees/branches/pure_python/BTrees/IIBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/IIBTree.py	2012-11-09 06:36:27 UTC (rev 128208)
+++ BTrees/branches/pure_python/BTrees/IIBTree.py	2012-11-09 06:36:28 UTC (rev 128209)
@@ -137,13 +137,13 @@
 
 weightedUnionPy = _setop(_weightedUnion, IISetPy)
 try:
-    from _OIBTree import union
+    from _IIBTree import weightedUnion
 except ImportError:
     weightedUnion = weightedUnionPy
 
 weightedIntersectionPy = _setop(_weightedIntersection, IISetPy)
 try:
-    from _OIBTree import weightedIntersection
+    from _IIBTree import weightedIntersection
 except ImportError:
     weightedIntersection = weightedIntersectionPy
 

Modified: BTrees/branches/pure_python/BTrees/LFBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/LFBTree.py	2012-11-09 06:36:27 UTC (rev 128208)
+++ BTrees/branches/pure_python/BTrees/LFBTree.py	2012-11-09 06:36:28 UTC (rev 128209)
@@ -137,7 +137,7 @@
 
 weightedUnionPy = _setop(_weightedUnion, LFSetPy)
 try:
-    from _OIBTree import union
+    from _OIBTree import weightedUnion
 except ImportError:
     weightedUnion = weightedUnionPy
 

Modified: BTrees/branches/pure_python/BTrees/LLBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/LLBTree.py	2012-11-09 06:36:27 UTC (rev 128208)
+++ BTrees/branches/pure_python/BTrees/LLBTree.py	2012-11-09 06:36:28 UTC (rev 128209)
@@ -137,13 +137,13 @@
 
 weightedUnionPy = _setop(_weightedUnion, LLSetPy)
 try:
-    from _OIBTree import union
+    from _LLBTree import weightedUnion
 except ImportError:
     weightedUnion = weightedUnionPy
 
 weightedIntersectionPy = _setop(_weightedIntersection, LLSetPy)
 try:
-    from _OIBTree import weightedIntersection
+    from _LLBTree import weightedIntersection
 except ImportError:
     weightedIntersection = weightedIntersectionPy
 

Modified: BTrees/branches/pure_python/BTrees/OLBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/OLBTree.py	2012-11-09 06:36:27 UTC (rev 128208)
+++ BTrees/branches/pure_python/BTrees/OLBTree.py	2012-11-09 06:36:28 UTC (rev 128209)
@@ -130,7 +130,7 @@
 
 weightedUnionPy = _setop(_weightedUnion, OLSetPy)
 try:
-    from _OLBTree import union
+    from _OLBTree import weightedUnion
 except ImportError:
     weightedUnion = weightedUnionPy