[Checkins] SVN: Products.CMFTopic/trunk/Products/CMFTopic/ - reverted r122827 (the workaround is no longer needed)

[Yvo Schubbe]

Log message for revision 122829:
  - reverted r122827 (the workaround is no longer needed)

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

-=-
Modified: Products.CMFTopic/trunk/Products/CMFTopic/Topic.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/Topic.py	2011-09-17 08:36:47 UTC (rev 122828)
+++ Products.CMFTopic/trunk/Products/CMFTopic/Topic.py	2011-09-17 08:38:20 UTC (rev 122829)
@@ -22,7 +22,6 @@
 
 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
@@ -139,9 +138,7 @@
         o Built-in criteria update any criteria passed in 'kw'.
         """
         kw.update(self.buildQuery())
-# XXX: fix this
-#        ctool = getUtility(ICatalogTool)
-        ctool = getToolByName(self, 'portal_catalog')
+        ctool = getUtility(ICatalogTool)
         return ctool.searchResults(REQUEST, **kw)
 
     security.declareProtected(View, 'synContentValues')

Modified: Products.CMFTopic/trunk/Products/CMFTopic/tests/test_Topic.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/tests/test_Topic.py	2011-09-17 08:36:47 UTC (rev 122828)
+++ Products.CMFTopic/trunk/Products/CMFTopic/tests/test_Topic.py	2011-09-17 08:38:20 UTC (rev 122829)
@@ -143,8 +143,7 @@
 
     def _initSite(self, max_items=15, index_ids=()):
         sm = getSiteManager()
-        self.site.portal_catalog = DummyCatalog(index_ids)
-        sm.registerUtility(self.site.portal_catalog, ICatalogTool)
+        sm.registerUtility(DummyCatalog(index_ids), ICatalogTool)
         sm.registerUtility(DummySyndicationTool(max_items), ISyndicationTool)
 
     def _initDocuments(self, **kw):