[Checkins] SVN: Zope/trunk/src/Products/ZCatalog/ZCatalog.py More readable style

Hanno Schlichting hannosch at hannosch.eu
Sun Aug 1 06:40:51 EDT 2010


Log message for revision 115311:
  More readable style
  

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-08-01 10:37:41 UTC (rev 115310)
+++ Zope/trunk/src/Products/ZCatalog/ZCatalog.py	2010-08-01 10:40:51 UTC (rev 115311)
@@ -701,28 +701,27 @@
         need here; the ability to apply a method to all the objects
         *as they're found* and the need to pass the object's path into
         that method.
-
         """
 
         if result is None:
-            result=[]
+            result = []
 
             if obj_metatypes and 'all' in obj_metatypes:
-                obj_metatypes=None
+                obj_metatypes = None
 
-            if obj_mtime and type(obj_mtime)==type('s'):
-                obj_mtime=DateTime(obj_mtime).timeTime()
+            if obj_mtime and isinstance(obj_mtime, str):
+                obj_mtime = DateTime(obj_mtime).timeTime()
 
             if obj_permission:
-                obj_permission=p_name(obj_permission)
+                obj_permission = p_name(obj_permission)
 
-            if obj_roles and type(obj_roles) is type('s'):
-                obj_roles=[obj_roles]
+            if obj_roles and isinstance(obj_roles, str):
+                obj_roles = [obj_roles]
 
             if obj_expr:
                 # Setup expr machinations
-                md=td()
-                obj_expr=(Eval(obj_expr), md, md._push, md._pop)
+                md = td()
+                obj_expr = (Eval(obj_expr), md, md._push, md._pop)
 
         base = aq_base(obj)
 



More information about the checkins mailing list