[CMF-checkins] CVS: Products/CMFCore - CatalogTool.py:1.55.2.8

[Yvo Schubbe]

Update of /cvs-repository/Products/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv24741/CMFCore

Modified Files:
      Tag: CMF-1_5-branch
	CatalogTool.py 
Log Message:
removed obsolete Vocabulary (this did belong to the no longer used TextIndex)


=== Products/CMFCore/CatalogTool.py 1.55.2.7 => 1.55.2.8 ===
--- Products/CMFCore/CatalogTool.py:1.55.2.7	Sun Apr 24 19:45:49 2005
+++ Products/CMFCore/CatalogTool.py	Thu Jul  7 13:24:28 2005
@@ -97,13 +97,6 @@
 
     def __init__(self):
         ZCatalog.__init__(self, self.getId())
-
-        if not hasattr(self, 'Vocabulary'):
-            # As of 2.6, the Catalog no longer adds a vocabulary in itself
-            from Products.PluginIndexes.TextIndex.Vocabulary import Vocabulary
-            vocabulary = Vocabulary('Vocabulary', 'Vocabulary', globbing=1)
-            self._setObject('Vocabulary', vocabulary)
-
         self._initIndexes()
 
     #