Log message for revision 115345: Simplify make_query a bit Changed: U Zope/trunk/src/Products/ZCatalog/Catalog.py
-=- Modified: Zope/trunk/src/Products/ZCatalog/Catalog.py =================================================================== --- Zope/trunk/src/Products/ZCatalog/Catalog.py 2010-08-01 17:17:42 UTC (rev 115344) +++ Zope/trunk/src/Products/ZCatalog/Catalog.py 2010-08-01 17:19:51 UTC (rev 115345) @@ -445,10 +445,9 @@ query = {} query.update(request.keywords) real_req = request.request - if isinstance(request.request, dict): + if isinstance(real_req, dict): query.update(real_req) - else: - real_req = request.request + real_req = None else: real_req = request _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins