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

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Nov 27 09:32:01 2007
New Revision: 17805

URL: http://svn.erp5.org?rev=17805&view=rev
Log:
Base.getProperty: don't use hasattr on persistent object, getattr
aq_portal_type on Base class only once.


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=17805&r1=17804&r2=17805&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Base.py (original)
+++ erp5/trunk/products/ERP5Type/Base.py Tue Nov 27 09:32:01 2007
@@ -1235,7 +1235,7 @@
     """
     accessor_name = 'get' + UpperCase(key)
     aq_self = aq_base(self)
-    if hasattr(aq_self, accessor_name):
+    if getattr(aq_self, accessor_name, None) is not None:
       method = getattr(self, accessor_name)
       if d is not _MARKER:
         try:
@@ -1248,12 +1248,13 @@
       return method(**kw)
     # Try to get a portal_type property (Implementation Dependent)
     aq_key = self._aq_key()
-    if not Base.aq_portal_type.has_key(aq_key):
+    aq_portal_type = Base.aq_portal_type
+    if aq_key not in aq_portal_type:
       try:
         self._aq_dynamic(accessor_name)
       except AttributeError:
         pass
-    if hasattr(Base.aq_portal_type[aq_key], accessor_name):
+    if hasattr(aq_portal_type[aq_key], accessor_name):
       method = getattr(self, accessor_name)
       if d is not _MARKER:
         try: