[Zope-Checkins] SVN: Zope/trunk/src/Products/ZCatalog/ZCatalog.py Pyflakes

Hanno Schlichting hannosch at hannosch.eu
Fri Jul 9 14:18:04 EDT 2010


Log message for revision 114397:
  Pyflakes

Changed:
  U   Zope/trunk/src/Products/ZCatalog/ZCatalog.py

-=-
Modified: Zope/trunk/src/Products/ZCatalog/ZCatalog.py
===================================================================
--- Zope/trunk/src/Products/ZCatalog/ZCatalog.py	2010-07-09 18:17:21 UTC (rev 114396)
+++ Zope/trunk/src/Products/ZCatalog/ZCatalog.py	2010-07-09 18:18:03 UTC (rev 114397)
@@ -330,25 +330,23 @@
         elapse = time.time()
         c_elapse = time.clock()
 
-        words = 0
         obj = REQUEST.PARENTS[1]
         path = '/'.join(obj.getPhysicalPath())
 
+        self.ZopeFindAndApply(obj,
+                              obj_metatypes=obj_metatypes,
+                              obj_ids=obj_ids,
+                              obj_searchterm=obj_searchterm,
+                              obj_expr=obj_expr,
+                              obj_mtime=obj_mtime,
+                              obj_mspec=obj_mspec,
+                              obj_permission=obj_permission,
+                              obj_roles=obj_roles,
+                              search_sub=1,
+                              REQUEST=REQUEST,
+                              apply_func=self.catalog_object,
+                              apply_path=path)
 
-        results = self.ZopeFindAndApply(obj,
-                                        obj_metatypes=obj_metatypes,
-                                        obj_ids=obj_ids,
-                                        obj_searchterm=obj_searchterm,
-                                        obj_expr=obj_expr,
-                                        obj_mtime=obj_mtime,
-                                        obj_mspec=obj_mspec,
-                                        obj_permission=obj_permission,
-                                        obj_roles=obj_roles,
-                                        search_sub=1,
-                                        REQUEST=REQUEST,
-                                        apply_func=self.catalog_object,
-                                        apply_path=path)
-
         elapse = time.time() - elapse
         c_elapse = time.clock() - c_elapse
 



More information about the Zope-Checkins mailing list