[Checkins] SVN: Products.CMFTopic/trunk/Products/CMFTopic/ - converted three more tools

[Yvo Schubbe]

Log message for revision 122823:
  - converted three more tools

Changed:
  U   Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt
  UU  Products.CMFTopic/trunk/Products/CMFTopic/Topic.py
  U   Products.CMFTopic/trunk/Products/CMFTopic/tests/test_Topic.py

-=-
Modified: Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt	2011-09-16 12:19:58 UTC (rev 122822)
+++ Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt	2011-09-16 12:20:11 UTC (rev 122823)
@@ -4,7 +4,9 @@
 2.3.0-alpha (unreleased)
 ------------------------
 
-- Correct test assertion about the value of DateCriteria. It's edit method
+-- Made sure converted tools are used as utilities.
+
+ Correct test assertion about the value of DateCriteria. It's edit method
   mandates the value to be of type int, so we should respect that in tests.
 
 - Require at least Zope 2.13.4.

Modified: Products.CMFTopic/trunk/Products/CMFTopic/Topic.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/Topic.py	2011-09-16 12:19:58 UTC (rev 122822)
+++ Products.CMFTopic/trunk/Products/CMFTopic/Topic.py	2011-09-16 12:20:11 UTC (rev 122823)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """ Topic: Canned catalog queries
-
-$Id$
 """
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
@@ -22,14 +20,14 @@
 from zope.component.factory import Factory
 from zope.interface import implements
 
+from Products.CMFCore.interfaces import ICatalogTool
 from Products.CMFCore.interfaces import ISyndicationTool
-from Products.CMFCore.utils import getToolByName
 from Products.CMFDefault.SkinnedFolder import SkinnedFolder
 from Products.CMFTopic.interfaces import IMutableTopic
 from Products.CMFTopic.interfaces import ITopic
-from Products.CMFTopic.permissions import View
 from Products.CMFTopic.permissions import AddTopics
 from Products.CMFTopic.permissions import ChangeTopics
+from Products.CMFTopic.permissions import View
 
 def addTopic(self, id, title='', REQUEST=None):
     """ Create an empty topic.
@@ -80,11 +78,11 @@
     def listAvailableFields(self):
         """ Return a list of available fields for new criteria.
         """
-        portal_catalog = getToolByName( self, 'portal_catalog' )
+        ctool = getUtility(ICatalogTool)
         currentfields = map( lambda x: x.Field(), self.listCriteria() )
         availfields = filter(
             lambda field, cf=currentfields: field not in cf,
-            portal_catalog.indexes()
+            ctool.indexes()
             )
         return availfields
 
@@ -139,9 +137,9 @@
 
         o Built-in criteria update any criteria passed in 'kw'.
         """
-        kw.update( self.buildQuery() )
-        portal_catalog = getToolByName( self, 'portal_catalog' )
-        return portal_catalog.searchResults(REQUEST, **kw)
+        kw.update(self.buildQuery())
+        ctool = getUtility(ICatalogTool)
+        return ctool.searchResults(REQUEST, **kw)
 
     security.declareProtected(View, 'synContentValues')
     def synContentValues(self):


Property changes on: Products.CMFTopic/trunk/Products/CMFTopic/Topic.py
___________________________________________________________________
Deleted: svn:keywords
   - Author Date Id Revision

Modified: Products.CMFTopic/trunk/Products/CMFTopic/tests/test_Topic.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/tests/test_Topic.py	2011-09-16 12:19:58 UTC (rev 122822)
+++ Products.CMFTopic/trunk/Products/CMFTopic/tests/test_Topic.py	2011-09-16 12:20:11 UTC (rev 122823)
@@ -20,11 +20,11 @@
 from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.User import UnrestrictedUser
 from Acquisition import Implicit
-
 from zope.component import getSiteManager
 from zope.interface.verify import verifyClass
 from zope.site.hooks import setSite
 
+from Products.CMFCore.interfaces import ICatalogTool
 from Products.CMFCore.interfaces import ISyndicationTool
 from Products.CMFCore.testing import ConformsToFolder
 from Products.CMFCore.testing import EventZCMLLayer
@@ -143,18 +143,17 @@
 
     def _initSite(self, max_items=15, index_ids=()):
         sm = getSiteManager()
-        self.site.portal_catalog = DummyCatalog( index_ids )
-        self.site.portal_syndication = DummySyndicationTool( max_items )
-        sm.registerUtility(self.site.portal_syndication, ISyndicationTool)
+        sm.registerUtility(DummyCatalog(index_ids), ICatalogTool)
+        sm.registerUtility(DummySyndicationTool(max_items), ISyndicationTool)
 
     def _initDocuments(self, **kw):
+        ctool = getSiteManager().getUtility(ICatalogTool)
         for k, v in kw.items():
-
-            document = DummyDocument( k )
+            document = DummyDocument(k)
             document.description = v
 
-            self.site._setObject( k, v )
-            self.site.portal_catalog._index( document )
+            self.site._setObject(k, v)
+            ctool._index(document)
 
     def setUp(self):
         SecurityTest.setUp(self)