ERP5Type: micro-optimize edit/getProperty

Optimize edit by calculating the set of restricted accessors only once
at class generation instead of calculating it each call.
Optimize edit by using the same technique to decide if getattr or
guarded_getattr has to be used to get the property.

product/ERP5Type/Base.py

@@ -755,6 +755,14 @@ class Base( CopyContainer,
   aq_method_generating = []
   aq_portal_type = {}
   aq_related_generated = 0
+  # These sets are generated when dynamically making a portal type class to
+  # short-cut guarded_getattr in edit/getProperty. For classes that are not
+  # dynamically generated from portal type, we always check security.
+  _restricted_getter_set = _restricted_setter_set = type(
+      'infinite set',
+      (set, ),
+      {'__contains__': lambda *args: True},
+  )()
   # Only generateIdList may look at this property. Anything else is unsafe.
   _id_generator_state = None
 
@@ -1222,7 +1230,15 @@ class Base( CopyContainer,
   def _getProperty(self, key, d=_MARKER, restricted=False, **kw):
     __traceback_info__ = (key,)
     accessor_name = 'get' + UpperCase(key)
-    _getattr = guarded_getattr if restricted else getattr
+
+    # for restricted properties (ie. properties protected with another permission
+    # that AccessContentsInformation, which was already checked when calling this
+    # getProperty), we use guarded_getattr, other we use a simple getattr that
+    # is slightly faster.
+    _getattr = getattr
+    if restricted and accessor_name in self.__class__._restricted_getter_set:
+      _getattr = guarded_getattr
+
     aq_self = aq_base(self)
     if getattr(aq_self, accessor_name, None) is not None:
       try:
@@ -1470,14 +1486,8 @@ class Base( CopyContainer,
     unordered_key_list = [k for k in key_list if k not in edit_order]
     ordered_key_list = [k for k in edit_order if k in key_list]
     if restricted:
-      # retrieve list of accessors which doesn't use default permissions
-      restricted_method_set = {method
-        for ancestor in self.__class__.mro()
-        for permissions in getattr(ancestor, '__ac_permissions__', ())
-        if permissions[0] not in ('Access contents information',
-                                  'Modify portal content')
-        for method in permissions[1]
-        if method.startswith('set')}
+      # accessors which doesn't use default permissions
+      restricted_method_set = self.__class__._restricted_setter_set
     else:
       restricted_method_set = ()
 
@@ -1512,7 +1522,7 @@ class Base( CopyContainer,
           accessor_name = 'set' + UpperCase(key)
           if accessor_name in restricted_method_set:
             # will raise Unauthorized when not allowed
-            guarded_getattr(self, accessor_name)
+            guarded_getattr(self, accessor_name, None)
         modified_property_dict[key] = old_value
         if key != 'id':
           modified_object_list = _setProperty(key, kw[key])

product/ERP5Type/dynamic/portal_type_class.py

@@ -323,6 +323,21 @@ def generatePortalTypeClass(site, portal_type_name):
   if portal_type_name in core_portal_type_class_dict:
     core_portal_type_class_dict[portal_type_name]['generating'] = False
 
+  attribute_dict['_restricted_setter_set'] = {method
+        for ancestor in base_class_list
+        for permissions in getattr(ancestor, '__ac_permissions__', ())
+        if permissions[0] not in ('Access contents information',
+                                  'Modify portal content')
+        for method in permissions[1]
+        if method.startswith('set')}
+
+  attribute_dict['_restricted_getter_set'] = {method
+        for ancestor in base_class_list
+        for permissions in getattr(ancestor, '__ac_permissions__', ())
+        if permissions[0] not in ('Access contents information', )
+        for method in permissions[1]
+        if method.startswith('get')}
+
   #LOG("ERP5Type.dynamic", INFO,
   #    "Portal type %s loaded with bases %s" \
   #        % (portal_type_name, repr(base_class_list)))