ERP5Type: getAccessorHolderPropertyList should always exist

product/ERP5Type/Base.py

@@ -779,13 +779,10 @@ class Base( CopyContainer,
 
   def _propertyMap(self, local_properties=False):
     """ Method overload - properties are now defined on the ptype """
-    klass = self.__class__
     property_list = []
     # Get all the accessor holders for this portal type
     if not local_properties:
-      if hasattr(klass, 'getAccessorHolderPropertyList'):
-        property_list += \
-            self.__class__.getAccessorHolderPropertyList()
+      property_list += self.__class__.getAccessorHolderPropertyList()
 
     property_list += getattr(self, '_local_properties', [])
     return tuple(property_list)

product/ERP5Type/dynamic/lazy_class.py

@@ -178,7 +178,7 @@ class PortalTypeMetaClass(GhostBaseMetaClass, PropertyHolder):
           if content or property['type'] != 'content':
             property_dict.setdefault(property['id'], property)
 
-    return property_dict.values()
+    return property_dict.itervalues()
 
   def resetAcquisition(cls):
     # First, fill the __get__ slot of the class