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

[nobody at svn.erp5.org]

Author: yo
Date: Fri Oct 22 14:04:21 2010
New Revision: 39476

URL: http://svn.erp5.org?rev=39476&view=rev
Log:
Stop skipping erp5.portal_type or erp5.temp_portal_type, because this makes interactions not working, and dangerous as well, as accessors are stored into document classes directly.

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=39476&r1=39475&r2=39476&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Base.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Base.py [utf8] Fri Oct 22 14:04:21 2010
@@ -830,11 +830,7 @@ class Base( CopyContainer,
                                        cache_factory='erp5_ui_long'))
 
   def _aq_key(self):
-    klass_list = self.__class__.__mro__
-    i = 0
-    while klass_list[i].__module__ in ('erp5.portal_type', 'erp5.temp_portal_type'):
-      i += 1
-    return (self.portal_type, klass_list[i])
+    return (self.portal_type, self.__class__)
 
   def _propertyMap(self):
     """ Method overload - properties are now defined on the ptype """
@@ -858,11 +854,7 @@ class Base( CopyContainer,
       Test purpose
     """
     ptype = self.portal_type
-    klass_list = self.__class__.__mro__
-    i = 0
-    while klass_list[i].__module__ in ('erp5.portal_type', 'erp5.temp_portal_type'):
-      i += 1
-    klass = klass_list[i]
+    klass = self.__class__
     aq_key = (ptype, klass) # We do not use _aq_key() here for speed
     initializePortalTypeDynamicProperties(self, klass, ptype, aq_key, \
         self.getPortalObject())
@@ -874,11 +866,7 @@ class Base( CopyContainer,
     # and default properties can be associated per portal type
     # and per class. Other uses are possible (ex. WebSection).
     ptype = self.portal_type
-    klass_list = self.__class__.__mro__
-    i = 0
-    while klass_list[i].__module__ in ('erp5.portal_type', 'erp5.temp_portal_type'):
-      i += 1
-    klass = klass_list[i]
+    klass = self.__class__
     aq_key = (ptype, klass) # We do not use _aq_key() here for speed
 
     # If this is a portal_type property and everything is already defined