[Erp5-report] r14440 - /erp5/trunk/products/ERP5/Document/Predicate.py

[nobody at svn.erp5.org]

Author: yo
Date: Thu May 10 14:46:21 2007
New Revision: 14440

URL: http://svn.erp5.org?rev=14440&view=rev
Log:
Use getattr instead of hasattr. Use items instead of iteritems whenever possible.

Modified:
    erp5/trunk/products/ERP5/Document/Predicate.py

Modified: erp5/trunk/products/ERP5/Document/Predicate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Predicate.py?rev=14440&r1=14439&r2=14440&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Predicate.py (original)
+++ erp5/trunk/products/ERP5/Document/Predicate.py Thu May 10 14:46:21 2007
@@ -92,18 +92,18 @@
     """
     self = self.asPredicate()
     result = 1
-    if not hasattr(aq_base(self), '_identity_criterion'):
+    if getattr(aq_base(self), '_identity_criterion', None) is None:
       self._identity_criterion = {}
       self._range_criterion = {}
 #    LOG('PREDICATE TEST', 0,
 #        'testing %s on context of %s' % \
 #        (self.getRelativeUrl(), context.getRelativeUrl()))
-    for property, value in self._identity_criterion.items():
+    for property, value in self._identity_criterion.iteritems():
       result = result and (context.getProperty(property) == value)
 #      LOG('predicate test', 0,
 #          '%s after prop %s : %s == %s' % \
 #          (result, property, context.getProperty(property), value))
-    for property, (min, max) in self._range_criterion.items():
+    for property, (min, max) in self._range_criterion.iteritems():
       value = context.getProperty(property)
       if min is not None:
         result = result and (value >= min)