[Zope3-checkins] CVS: Zope3/src/zope/textindex/tests - indexhtml.py:1.4 mailtest.py:1.4 mhindex.py:1.4 queryhtml.py:1.4 test_lexicon.py:1.3 test_nbest.py:1.3 test_pipelinefactory.py:1.3 test_queryengine.py:1.3 wordstats.py:1.4
Martijn Faassen
m.faassen@vet.uu.nl
Thu, 1 May 2003 15:36:23 -0400
Update of /cvs-repository/Zope3/src/zope/textindex/tests
In directory cvs.zope.org:/tmp/cvs-serv30407/zope/textindex/tests
Modified Files:
indexhtml.py mailtest.py mhindex.py queryhtml.py
test_lexicon.py test_nbest.py test_pipelinefactory.py
test_queryengine.py wordstats.py
Log Message:
Importgeddon part the second. Removed unused imports throughout the
source tree. This should have taken care of most unused imports
in Zope 3. :)
=== Zope3/src/zope/textindex/tests/indexhtml.py 1.3 => 1.4 ===
--- Zope3/src/zope/textindex/tests/indexhtml.py:1.3 Fri Apr 25 15:28:41 2003
+++ Zope3/src/zope/textindex/tests/indexhtml.py Thu May 1 15:35:52 2003
@@ -26,7 +26,6 @@
import os
from time import clock
-import zodb
from zodb.storage.file import FileStorage
from zodb.btrees.IOBTree import IOBTree
=== Zope3/src/zope/textindex/tests/mailtest.py 1.3 => 1.4 ===
--- Zope3/src/zope/textindex/tests/mailtest.py:1.3 Fri Apr 25 15:28:41 2003
+++ Zope3/src/zope/textindex/tests/mailtest.py Thu May 1 15:35:52 2003
@@ -53,8 +53,6 @@
index.search("python AND unicode")
"""
-import zodb
-import zodb.storage.file
from zope.textindex.lexicon import \
Lexicon, CaseNormalizer, Splitter, StopWordRemover
=== Zope3/src/zope/textindex/tests/mhindex.py 1.3 => 1.4 ===
--- Zope3/src/zope/textindex/tests/mhindex.py:1.3 Fri Apr 25 15:28:41 2003
+++ Zope3/src/zope/textindex/tests/mhindex.py Thu May 1 15:35:52 2003
@@ -62,16 +62,13 @@
from zodb.db import DB
from zodb.storage.file import FileStorage
from transaction import get_transaction
-from persistence import Persistent
from zodb.btrees.IOBTree import IOBTree
from zodb.btrees.OIBTree import OIBTree
from zodb.btrees.IIBTree import IIBTree
-from zope.textindex.nbest import NBest
from zope.textindex.okapiindex import OkapiIndex
-from zope.textindex.lexicon import Lexicon, Splitter
+from zope.textindex.lexicon import Splitter
from zope.textindex.lexicon import CaseNormalizer, StopWordRemover
-from zope.textindex.queryparser import QueryParser
from zope.textindex.stopdict import get_stopdict
from zope.textindex.textindexwrapper import TextIndexWrapper
=== Zope3/src/zope/textindex/tests/queryhtml.py 1.3 => 1.4 ===
--- Zope3/src/zope/textindex/tests/queryhtml.py:1.3 Fri Apr 25 15:28:41 2003
+++ Zope3/src/zope/textindex/tests/queryhtml.py Thu May 1 15:35:52 2003
@@ -11,10 +11,8 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-import os
from time import clock
-import zodb
from zodb.storage.file import FileStorage
QUERIES = ["nested recursive functions",
=== Zope3/src/zope/textindex/tests/test_lexicon.py 1.2 => 1.3 ===
--- Zope3/src/zope/textindex/tests/test_lexicon.py:1.2 Wed Dec 25 09:15:35 2002
+++ Zope3/src/zope/textindex/tests/test_lexicon.py Thu May 1 15:35:52 2003
@@ -13,7 +13,7 @@
##############################################################################
import sys
-from unittest import TestCase, TestSuite, main, makeSuite
+from unittest import TestCase, main, makeSuite
from zope.textindex.lexicon import Lexicon
from zope.textindex.lexicon import Splitter, CaseNormalizer
=== Zope3/src/zope/textindex/tests/test_nbest.py 1.2 => 1.3 ===
--- Zope3/src/zope/textindex/tests/test_nbest.py:1.2 Wed Dec 25 09:15:35 2002
+++ Zope3/src/zope/textindex/tests/test_nbest.py Thu May 1 15:35:52 2003
@@ -12,7 +12,7 @@
#
##############################################################################
-from unittest import TestCase, TestSuite, main, makeSuite
+from unittest import TestCase, main, makeSuite
from zope.textindex.nbest import NBest
=== Zope3/src/zope/textindex/tests/test_pipelinefactory.py 1.2 => 1.3 ===
--- Zope3/src/zope/textindex/tests/test_pipelinefactory.py:1.2 Wed Dec 25 09:15:35 2002
+++ Zope3/src/zope/textindex/tests/test_pipelinefactory.py Thu May 1 15:35:52 2003
@@ -12,7 +12,7 @@
#
##############################################################################
-from unittest import TestCase, TestSuite, main, makeSuite
+from unittest import TestCase, main, makeSuite
from zope.textindex.ipipelineelement import IPipelineElement
from zope.textindex.pipelinefactory import PipelineElementFactory
=== Zope3/src/zope/textindex/tests/test_queryengine.py 1.2 => 1.3 ===
--- Zope3/src/zope/textindex/tests/test_queryengine.py:1.2 Wed Dec 25 09:15:35 2002
+++ Zope3/src/zope/textindex/tests/test_queryengine.py Thu May 1 15:35:52 2003
@@ -17,7 +17,7 @@
from zodb.btrees.IIBTree import IIBucket
from zope.textindex.queryparser import QueryParser
-from zope.textindex.parsetree import ParseError, QueryError
+from zope.textindex.parsetree import QueryError
from zope.textindex.lexicon import Lexicon, Splitter
class FauxIndex:
=== Zope3/src/zope/textindex/tests/wordstats.py 1.3 => 1.4 ===
--- Zope3/src/zope/textindex/tests/wordstats.py:1.3 Fri Apr 25 15:28:41 2003
+++ Zope3/src/zope/textindex/tests/wordstats.py Thu May 1 15:35:52 2003
@@ -17,7 +17,6 @@
usage: wordstats.py data.fs [index key]
"""
-import zodb
from zodb.storage.file import FileStorage
def main(fspath, key):