[CMF-checkins] CVS: Products/CMFCore - CatalogTool.py:1.16

Tres Seaver tseaver@zope.com
Tue, 2 Oct 2001 10:40:52 -0400


Update of /cvs-repository/Products/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv16827/CMFCore

Modified Files:
	CatalogTool.py 
Log Message:


 - Remove silly dependency on REQUEST (catalog already does the
   Right Thing (tm) when none available).


=== Products/CMFCore/CatalogTool.py 1.15 => 1.16 ===
     # searchResults has inherited security assertions.
     def searchResults(self, REQUEST=None, **kw):
-        '''Calls SiteIndex.searchResults() with extra arguments that
+        '''Calls ZCatalog.searchResults with extra arguments that
         limit the results to what the user is allowed to see.
         '''
-        if REQUEST is None:
-            REQUEST = self.REQUEST
         user = _getAuthenticatedUser(self)
         kw['allowedRolesAndUsers'] = list(user.getRoles()) + \
                                      ['Anonymous',