code cleanup: removed removed SimpleItem as base class, removed

unneeded imports

lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py

@@ -13,12 +13,8 @@
 
 """Simple column indices"""
 
-__version__='$Revision: 1.7 $'[11:-2]
+__version__='$Revision: 1.8 $'[11:-2]
 
-from Globals import Persistent
-from Acquisition import Implicit
-import BTree
-import IOBTree
 from zLOG import LOG, ERROR
 from types import StringType, ListType, IntType, TupleType
 
@@ -30,15 +26,11 @@ import BTrees.Length
 from Products.PluginIndexes import PluggableIndex 
 from Products.PluginIndexes.common.UnIndex import UnIndex
 
-from Globals import Persistent, DTMLFile
-from Acquisition import Implicit
-from OFS.History import Historical
-from OFS.SimpleItem import SimpleItem
-
+from Globals import DTMLFile
 
 _marker = []
 
-class FieldIndex(UnIndex, Persistent, Implicit, SimpleItem):
+class FieldIndex(UnIndex):
     """Field Indexes"""
 
     __implements__ = (PluggableIndex.PluggableIndexInterface,)

lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py

@@ -15,18 +15,15 @@ from zLOG import LOG, ERROR
 from types import StringType
 from BTrees.OOBTree import OOSet, difference
 
-
 from Globals import Persistent, DTMLFile
 from Acquisition import Implicit
-from OFS.History import Historical
-from OFS.SimpleItem import SimpleItem
 
 from Products.PluginIndexes import PluggableIndex 
 from Products.PluginIndexes.common.UnIndex import UnIndex 
 
 _marker = []
 
-class KeywordIndex(UnIndex,Persistent, Implicit,SimpleItem):
+class KeywordIndex(UnIndex,Persistent, Implicit):
 
     __implements__ = (PluggableIndex.PluggableIndexInterface,)
 

lib/python/Products/PluginIndexes/PathIndex/PathIndex.py

@@ -11,14 +11,13 @@
 # 
 ##############################################################################
 
-__version__ = '$Id: PathIndex.py,v 1.20 2002/04/24 15:46:09 andreasjung Exp $'
+__version__ = '$Id: PathIndex.py,v 1.21 2002/04/25 12:32:13 andreasjung Exp $'
 
 from Products.PluginIndexes import PluggableIndex 
 from Products.PluginIndexes.common.util import parseIndexRequest
 
 from Globals import Persistent, DTMLFile
 from Acquisition import Implicit
-from OFS.SimpleItem import SimpleItem
 
 from BTrees.IOBTree import IOBTree
 from BTrees.OOBTree import OOBTree,OOSet
@@ -29,8 +28,7 @@ import re,warnings
 
 _marker = []
 
-
-class PathIndex(Persistent, Implicit, SimpleItem):
+class PathIndex(Persistent, Implicit):
     """ A path index stores all path components of the physical 
     path of an object: 
 

lib/python/Products/PluginIndexes/TextIndex/TextIndex.py

@@ -14,14 +14,13 @@
 """Text Index
 
 """
-__version__ = '$Revision: 1.29 $'[11:-2]
+__version__ = '$Revision: 1.30 $'[11:-2]
 
 
 import  re
 import operator,warnings
 from Globals import Persistent,DTMLFile
 from zLOG import LOG, ERROR
-from OFS.SimpleItem import SimpleItem
 from Acquisition import Implicit
 from Products.PluginIndexes.common.ResultList import ResultList
 from Products.PluginIndexes import PluggableIndex       
@@ -52,7 +51,7 @@ operator_dict = {'andnot': AndNot, 'and': And, 'or': Or,
                  '...': Near, 'near': Near,
                  AndNot: AndNot, And: And, Or: Or, Near: Near}
 
-class TextIndex(Persistent, Implicit, SimpleItem):
+class TextIndex(Persistent, Implicit):
     """Full-text index.
 
     There is a ZCatalog UML model that sheds some light on what is

lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py

@@ -11,21 +11,20 @@
 # 
 ##############################################################################
 
-__version__ = '$Id: TopicIndex.py,v 1.6 2002/04/24 15:46:09 andreasjung Exp $'
+__version__ = '$Id: TopicIndex.py,v 1.7 2002/04/25 12:32:14 andreasjung Exp $'
 
 from Products.PluginIndexes import PluggableIndex 
 from Products.PluginIndexes.common.util import parseIndexRequest
 
 from Globals import Persistent, DTMLFile
 from Acquisition import Implicit
-from OFS.SimpleItem import SimpleItem
 from BTrees.OOBTree import OOBTree
 from BTrees.IIBTree import IISet,intersection,union
 import FilteredSet
 
 _marker = []
 
-class TopicIndex(Persistent, Implicit, SimpleItem):
+class TopicIndex(Persistent, Implicit):
 
     """ A TopicIndex maintains a set of FilteredSet objects.
     Every FilteredSet object consists of an expression and