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

[nobody at svn.erp5.org]

Author: yo
Date: Thu May 10 14:11:44 2007
New Revision: 14438

URL: http://svn.erp5.org?rev=14438&view=rev
Log:
Use getattr instead of hasattr.

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=14438&r1=14437&r2=14438&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Predicate.py (original)
+++ erp5/trunk/products/ERP5/Document/Predicate.py Thu May 10 14:11:44 2007
@@ -471,10 +471,10 @@
           new_criterion_property_list.append(property)
           property_min = property + '_range_min'
           property_max = property + '_range_max'
-          if hasattr(self,'get%s' % convertToUpperCase(property)) \
+          if getattr(self, 'get%s' % convertToUpperCase(property), None) is not None\
             and self.getProperty(property) is not None:
             identity_criterion[property] = self.getProperty(property)
-          elif hasattr(self,'get%s' % convertToUpperCase(property_min)):
+          elif getattr(self, 'get%s' % convertToUpperCase(property_min), None) is not None:
             min = self.getProperty(property_min)
             max = self.getProperty(property_max)
             range_criterion[property] = (min,max)