Log message for revision 87864: some TextIndex cleanup Changed: U Zope/z212-deprecation-cleanup/lib/python/Products/ZCatalog/ZCatalog.py U Zope/z212-deprecation-cleanup/lib/python/Products/ZCatalog/__init__.py
-=- Modified: Zope/z212-deprecation-cleanup/lib/python/Products/ZCatalog/ZCatalog.py =================================================================== --- Zope/z212-deprecation-cleanup/lib/python/Products/ZCatalog/ZCatalog.py 2008-06-30 18:30:51 UTC (rev 87863) +++ Zope/z212-deprecation-cleanup/lib/python/Products/ZCatalog/ZCatalog.py 2008-06-30 18:46:47 UTC (rev 87864) @@ -504,15 +504,6 @@ '?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 """ Modified: Zope/z212-deprecation-cleanup/lib/python/Products/ZCatalog/__init__.py =================================================================== --- Zope/z212-deprecation-cleanup/lib/python/Products/ZCatalog/__init__.py 2008-06-30 18:30:51 UTC (rev 87863) +++ Zope/z212-deprecation-cleanup/lib/python/Products/ZCatalog/__init__.py 2008-06-30 18:46:47 UTC (rev 87864) @@ -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 @@ 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') _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins