[Zope3-checkins] CVS: Zope3/src/zope/index/text/tests - indexhtml.py:1.4 mailtest.py:1.2 mhindex.py:1.2 queryhtml.py:1.3 test_queryengine.py:1.2 test_setops.py:1.2 wordstats.py:1.2

[Fred L. Drake, Jr.]

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

Modified Files:
	indexhtml.py mailtest.py mhindex.py queryhtml.py 
	test_queryengine.py test_setops.py wordstats.py 
Log Message:


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


=== Zope3/src/zope/index/text/tests/indexhtml.py 1.3 => 1.4 ===
--- Zope3/src/zope/index/text/tests/indexhtml.py:1.3	Tue Nov  4 22:08:13 2003
+++ Zope3/src/zope/index/text/tests/indexhtml.py	Fri Feb 20 17:02:35 2004
@@ -24,8 +24,8 @@
 import os
 from time import clock
 
-from zodb.storage.file import FileStorage
-from zodb.btrees.IOBTree import IOBTree
+from ZODB.Storage.FileStorage import FileStorage
+from ZODB.BTrees.IOBTree import IOBTree
 
 from zope.index.text.htmlsplitter import HTMLWordSplitter
 from zope.index.text.lexicon import Lexicon, StopWordRemover


=== Zope3/src/zope/index/text/tests/mailtest.py 1.1 => 1.2 ===
--- Zope3/src/zope/index/text/tests/mailtest.py:1.1	Sun Jul 13 23:53:48 2003
+++ Zope3/src/zope/index/text/tests/mailtest.py	Fri Feb 20 17:02:35 2004
@@ -45,9 +45,9 @@
 You can also interact with the index after it is completed. Load the
 index from the database:
 
-    import zodb
-    from zodb.storage.file import FileStorage
-    fs = FileStorage(<data.fs>
+    import ZODB
+    from ZODB.Storage.FileStorage import FileStorage
+    fs = FileStorage(<data.fs>)
     db = ZODB.DB(fs)
     index = cn.open().root()["index"]
     index.search("python AND unicode")


=== Zope3/src/zope/index/text/tests/mhindex.py 1.1 => 1.2 ===
--- Zope3/src/zope/index/text/tests/mhindex.py:1.1	Sun Jul 13 23:53:48 2003
+++ Zope3/src/zope/index/text/tests/mhindex.py	Fri Feb 20 17:02:35 2004
@@ -59,12 +59,12 @@
 zopecode = os.path.expanduser(ZOPECODE)
 sys.path.insert(0, zopecode)
 
-from zodb.db import DB
-from zodb.storage.file import FileStorage
+from ZODB.DB import DB
+from ZODB.Storage.FileStorage import FileStorage
 from transaction import get_transaction
-from zodb.btrees.IOBTree import IOBTree
-from zodb.btrees.OIBTree import OIBTree
-from zodb.btrees.IIBTree import IIBTree
+from BTrees.IOBTree import IOBTree
+from BTrees.OIBTree import OIBTree
+from BTrees.IIBTree import IIBTree
 
 from zope.index.text.okapiindex import OkapiIndex
 from zope.index.text.lexicon import Splitter


=== Zope3/src/zope/index/text/tests/queryhtml.py 1.2 => 1.3 ===
--- Zope3/src/zope/index/text/tests/queryhtml.py:1.2	Sun Aug 17 02:09:06 2003
+++ Zope3/src/zope/index/text/tests/queryhtml.py	Fri Feb 20 17:02:35 2004
@@ -13,7 +13,7 @@
 ##############################################################################
 from time import clock
 
-from zodb.storage.file import FileStorage
+from ZODB.Storage.FileStorage import FileStorage
 
 QUERIES = ["nested recursive functions",
            "explicit better than implicit",


=== Zope3/src/zope/index/text/tests/test_queryengine.py 1.1 => 1.2 ===
--- Zope3/src/zope/index/text/tests/test_queryengine.py:1.1	Sun Jul 13 23:53:48 2003
+++ Zope3/src/zope/index/text/tests/test_queryengine.py	Fri Feb 20 17:02:35 2004
@@ -14,7 +14,7 @@
 
 import unittest
 
-from zodb.btrees.IIBTree import IIBucket
+from BTrees.IIBTree import IIBucket
 
 from zope.index.text.queryparser import QueryParser
 from zope.index.text.parsetree import QueryError


=== Zope3/src/zope/index/text/tests/test_setops.py 1.1 => 1.2 ===
--- Zope3/src/zope/index/text/tests/test_setops.py:1.1	Sun Jul 13 23:53:48 2003
+++ Zope3/src/zope/index/text/tests/test_setops.py	Fri Feb 20 17:02:35 2004
@@ -14,7 +14,7 @@
 
 from unittest import TestCase, main, makeSuite
 
-from zodb.btrees.IIBTree import IIBTree, IIBucket
+from BTrees.IIBTree import IIBTree, IIBucket
 
 from zope.index.text.setops import mass_weightedIntersection
 from zope.index.text.setops import mass_weightedUnion


=== Zope3/src/zope/index/text/tests/wordstats.py 1.1 => 1.2 ===
--- Zope3/src/zope/index/text/tests/wordstats.py:1.1	Sun Jul 13 23:53:48 2003
+++ Zope3/src/zope/index/text/tests/wordstats.py	Fri Feb 20 17:02:35 2004
@@ -17,7 +17,7 @@
 usage: wordstats.py data.fs [index key]
 """
 
-from zodb.storage.file import FileStorage
+from ZODB.Storage.FileStorage import FileStorage
 
 def main(fspath, key):
     fs = FileStorage(fspath, read_only=1)