merge from svn+ssh://andreasjung@svn.zope.org/repos/main/Zope/z212-de…

…precation-cleanup

ZCatalog.py

@@ -504,15 +504,6 @@ def manage_reindexIndex(self, ids=None, REQUEST=None, RESPONSE=None,
                 '?manage_tabs_message=Reindexing%20Performed')
 
 
-    # BBB: will be removed in Zope 2.12 (like TextIndex itself)
-    security.declareProtected(manage_zcatalog_entries, 'availableSplitters')
-    def availableSplitters(self):
-        """ splitter we can add """
-        # This import will trigger a deprecation warning about TextIndex
-        from Products.PluginIndexes.TextIndex import Splitter
-        return Splitter.availableSplitters
-
-
     security.declareProtected(manage_zcatalog_entries, 'catalog_object')
     def catalog_object(self, obj, uid=None, idxs=None, update_metadata=1, pghandler=None):
         """ wrapper around catalog """

__init__.py

@@ -14,7 +14,6 @@
 """ZCatalog product"""
 
 import ZCatalog, CatalogAwareness, CatalogPathAwareness
-from Products.PluginIndexes.TextIndex import Vocabulary
 
 # BBB: ZClasses are deprecated but we don't want the warning to appear here
 import warnings
@@ -44,13 +43,6 @@ def initialize(context):
         icon='www/ZCatalog.gif',
         )
 
-    context.registerClass(
-        Vocabulary.Vocabulary,
-        permission='Add Vocabularies',
-        constructors=(Vocabulary.manage_addVocabularyForm,
-                      Vocabulary.manage_addVocabulary),
-        icon='www/Vocabulary.gif',
-        )
 
     context.registerHelp()
     context.registerHelpTitle('Zope Help')