[Erp5-report] r22576 - /erp5/trunk/products/ERP5Type/Base.py

[nobody at svn.erp5.org]

Author: jp
Date: Sun Jul 20 15:29:35 2008
New Revision: 22576

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

Modified:
    erp5/trunk/products/ERP5Type/Base.py

Modified: erp5/trunk/products/ERP5Type/Base.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Base.py?rev=22576&r1=22575&r2=22576&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Base.py (original)
+++ erp5/trunk/products/ERP5Type/Base.py Sun Jul 20 15:29:35 2008
@@ -1410,14 +1410,14 @@
       return
     # Try to get a portal_type property (Implementation Dependent)
     aq_key = self._aq_key()
-    if not Base.aq_portal_type.has_key(aq_key):
+    if getattr(Base.aq_portal_type, aq_key, None) is not None:
       self._aq_dynamic('id') # Make sure _aq_dynamic has been called once
-    if hasattr(Base.aq_portal_type[aq_key], accessor_name):
+    if getattr(Base.aq_portal_type[aq_key], accessor_name, None) is not None:
       method = getattr(self, accessor_name)
       # LOG("Base.py", 0, "method = %s, name = %s" %(method, accessor_name))
       method(value, **kw)
       return
-    if hasattr(Base.aq_portal_type[aq_key], public_accessor_name):
+    if getattr(Base.aq_portal_type[aq_key], public_accessor_name, None) is not None:
       method = getattr(self, public_accessor_name)
       method(value, **kw)
       return