[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ - removed temporary hacks (obsolete with ZCatalog >= 2.13.21)

[Yvo Schubbe]

Log message for revision 123136:
  - removed temporary hacks (obsolete with ZCatalog >= 2.13.21)

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/CatalogTool.py
  U   Products.CMFCore/trunk/Products/CMFCore/tests/test_CatalogTool.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/CatalogTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CatalogTool.py	2011-10-21 07:34:53 UTC (rev 123135)
+++ Products.CMFCore/trunk/Products/CMFCore/CatalogTool.py	2011-10-21 07:38:34 UTC (rev 123136)
@@ -17,8 +17,6 @@
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from AccessControl.SecurityManagement import getSecurityManager
 from Acquisition import aq_base
-from Acquisition import aq_chain
-from Acquisition import aq_parent
 from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from DateTime.DateTime import DateTime
@@ -27,13 +25,11 @@
 from zope.component import adapts
 from zope.component import queryMultiAdapter
 from zope.component import queryUtility
-from zope.globalrequest import getRequest
 from zope.interface import implements
 from zope.interface import providedBy
 from zope.interface.declarations import getObjectSpecification
 from zope.interface.declarations import ObjectSpecification
 from zope.interface.declarations import ObjectSpecificationDescriptor
-from ZPublisher.BaseRequest import RequestContainer
 
 from Products.CMFCore.ActionProviderBase import ActionProviderBase
 from Products.CMFCore.interfaces import ICatalogTool
@@ -232,7 +228,7 @@
                     range = 'min:max'
                 kw[k] = {'query': query, 'range': range}
 
-        return self.unrestrictedSearchResults(REQUEST, **kw)
+        return ZCatalog.searchResults(self, REQUEST, **kw)
 
     __call__ = searchResults
 
@@ -249,26 +245,8 @@
         If you're in doubt if you should use this method or
         'searchResults' use the latter.
         """
-        # XXX: catalog brains use self.REQUEST in getURL
-        # usually the REQUEST argument is no request, so we always look it up
-        real_request = getRequest()
-        if real_request is not None:
-            mod_self = RequestContainer(REQUEST=real_request)
-            for item in reversed(aq_chain(self)):
-                if getattr(item, '__of__', None) is not None:
-                    mod_self = item.__of__(mod_self)
-        else:
-            mod_self = self
-        return ZCatalog.searchResults(mod_self, REQUEST, **kw)
+        return ZCatalog.searchResults(self, REQUEST, **kw)
 
-    def getPhysicalRoot(self):
-        # XXX: catalog brains use getPhysicalRoot for wrapping objects
-        app = aq_parent(self).getPhysicalRoot()
-        request = getRequest()
-        if request is not None and getattr(app, '__of__', None) is not None:
-            app = app.__of__(RequestContainer(REQUEST=request))
-        return app
-
     def __url(self, ob):
         return '/'.join( ob.getPhysicalPath() )
 

Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_CatalogTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_CatalogTool.py	2011-10-21 07:34:53 UTC (rev 123135)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_CatalogTool.py	2011-10-21 07:38:34 UTC (rev 123136)
@@ -473,14 +473,14 @@
         ctool.catalog_object(site.dummy, '/dummy')
 
         query = {'meta_type': 'Dummy'}
-        setRequest(self.REQUEST)
         brain = ctool.searchResults(query)[0]
-        clearRequest()
 
+        setRequest(self.REQUEST)
         self.assertEqual('/dummy', brain.getPath())
         self.assertEqual('http://nohost/dummy', brain.getURL())
         self.assertEqual(site.dummy, brain.getObject())
         self.assertTrue(hasattr(brain.getObject(), 'REQUEST'))
+        clearRequest()
 
     def test_refreshCatalog(self):
         site = DummySite('site')