Log message for revision 68428:
Merged r68427 from 2.10 branch:
Removed a warning at Zope startup.
Changed:
U Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py
-=-
Modified: Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py
===================================================================
--- Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py 2006-06-01 10:36:10 UTC
(rev 68427)
+++ Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py 2006-06-01 10:40:02 UTC
(rev 68428)
@@ -37,7 +37,6 @@
from Products.PluginIndexes.common.PluggableIndex \
import PluggableIndexInterface
from Products.PluginIndexes.interfaces import IPluggableIndex
-from Products.PluginIndexes.TextIndex import Splitter
from zope.interface import implements
from Catalog import Catalog, CatalogError
@@ -508,9 +507,12 @@
'?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
_______________________________________________
Zope-Checkins maillist - Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins
