[Zope3-checkins] CVS: Zope3/src/zope/index/text - baseindex.py:1.4 cosineindex.py:1.2 lexicon.py:1.4 okapiindex.py:1.3 parsetree.py:1.2 setops.py:1.2

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope3/src/zope/index/text
In directory cvs.zope.org:/tmp/cvs-serv15099/src/zope/index/text

Modified Files:
	baseindex.py cosineindex.py lexicon.py okapiindex.py 
	parsetree.py setops.py 
Log Message:


remove use of the ZODB 4 "zodb" facade package; use ZODB 3 directly


=== Zope3/src/zope/index/text/baseindex.py 1.3 => 1.4 ===
--- Zope3/src/zope/index/text/baseindex.py:1.3	Fri Feb 20 11:57:36 2004
+++ Zope3/src/zope/index/text/baseindex.py	Fri Feb 20 17:02:35 2004
@@ -20,10 +20,10 @@
 from persistent import Persistent
 from zope.interface import implements
 
-from zodb.btrees.IOBTree import IOBTree
-from zodb.btrees.IIBTree import IIBTree, IITreeSet
-from zodb.btrees.IIBTree import intersection, difference
-from zodb.btrees import Length
+from BTrees.IOBTree import IOBTree
+from BTrees.IIBTree import IIBTree, IITreeSet
+from BTrees.IIBTree import intersection, difference
+from BTrees import Length
 
 from zope.index.interfaces import IInjection, IStatistics, IExtendedQuerying
 from zope.index.text import widcode


=== Zope3/src/zope/index/text/cosineindex.py 1.1 => 1.2 ===
--- Zope3/src/zope/index/text/cosineindex.py:1.1	Sun Jul 13 23:53:41 2003
+++ Zope3/src/zope/index/text/cosineindex.py	Fri Feb 20 17:02:35 2004
@@ -16,7 +16,7 @@
 
 import math
 
-from zodb.btrees.IIBTree import IIBucket
+from BTrees.IIBTree import IIBucket
 from zope.interface import implements
 
 from zope.index.text.baseindex import BaseIndex, inverse_doc_frequency


=== Zope3/src/zope/index/text/lexicon.py 1.3 => 1.4 ===
--- Zope3/src/zope/index/text/lexicon.py:1.3	Fri Feb 20 11:57:36 2004
+++ Zope3/src/zope/index/text/lexicon.py	Fri Feb 20 17:02:35 2004
@@ -16,8 +16,8 @@
 
 from zope.interface import implements
 
-from zodb.btrees.IOBTree import IOBTree
-from zodb.btrees.OIBTree import OIBTree
+from BTrees.IOBTree import IOBTree
+from BTrees.OIBTree import OIBTree
 
 from persistent import Persistent
 


=== Zope3/src/zope/index/text/okapiindex.py 1.2 => 1.3 ===
--- Zope3/src/zope/index/text/okapiindex.py:1.2	Sun Aug 17 02:09:03 2003
+++ Zope3/src/zope/index/text/okapiindex.py	Fri Feb 20 17:02:35 2004
@@ -17,7 +17,7 @@
 # Lots of comments are at the bottom of this file.  Read them to
 # understand what's going on.
 
-from zodb.btrees.IIBTree import IIBucket
+from BTrees.IIBTree import IIBucket
 
 from zope.index.text.baseindex import BaseIndex
 from zope.index.text.baseindex import inverse_doc_frequency, scaled_int


=== Zope3/src/zope/index/text/parsetree.py 1.1 => 1.2 ===
--- Zope3/src/zope/index/text/parsetree.py:1.1	Sun Jul 13 23:53:41 2003
+++ Zope3/src/zope/index/text/parsetree.py	Fri Feb 20 17:02:35 2004
@@ -14,7 +14,7 @@
 
 """Generic parser support: exception and parse tree nodes."""
 
-from zodb.btrees.IIBTree import difference
+from BTrees.IIBTree import difference
 
 from zope.index.interfaces.queryparsetree import IQueryParseTree
 from zope.index.text.setops import mass_weightedIntersection, mass_weightedUnion


=== Zope3/src/zope/index/text/setops.py 1.1 => 1.2 ===
--- Zope3/src/zope/index/text/setops.py:1.1	Sun Jul 13 23:53:41 2003
+++ Zope3/src/zope/index/text/setops.py	Fri Feb 20 17:02:35 2004
@@ -14,7 +14,7 @@
 
 """SetOps -- Weighted intersections and unions applied to many inputs."""
 
-from zodb.btrees.IIBTree import \
+from BTrees.IIBTree import \
      IIBucket, weightedIntersection, weightedUnion
 
 from zope.index.text.nbest import NBest