diff --git a/product/ERP5Type/Base.py b/product/ERP5Type/Base.py index 896b7d1c3b8d5febf62ef8046655f9696126cc3e..8dd796bc84f3b6d319128803bfcec1e825aed346 100644 --- a/product/ERP5Type/Base.py +++ b/product/ERP5Type/Base.py @@ -329,7 +329,7 @@ class PropertyHolder(object): self._constraints = [] self.constraints = [] - def _getItemList(self): + def _getPropertyHolderItemList(self): return [x for x in self.__dict__.items() if x[0] not in PropertyHolder.RESERVED_PROPERTY_SET] @@ -437,7 +437,7 @@ class PropertyHolder(object): """ accessor_method_item_list = [] accessor_method_item_list_append = accessor_method_item_list.append - for x, y in self._getItemList(): + for x, y in self._getPropertyHolderItemList(): if isinstance(y, tuple): if y is PropertyHolder.WORKFLOW_METHOD_MARKER or x == '__ac_permissions__': continue @@ -460,7 +460,7 @@ class PropertyHolder(object): """ Return a list of tuple (id, method) for every workflow method """ - return [x for x in self._getItemList() if isinstance(x[1], WorkflowMethod) + return [x for x in self._getPropertyHolderItemList() if isinstance(x[1], WorkflowMethod) or (isinstance(x[1], types.TupleType) and x[1] is PropertyHolder.WORKFLOW_METHOD_MARKER)] diff --git a/product/ERP5Type/dynamic/accessor_holder.py b/product/ERP5Type/dynamic/accessor_holder.py index 9db3ddb2bf32e11e6684fdcd3faa4868225defff..b3e633d23b8ede01fd915c9af51ae790c83a3c1b 100644 --- a/product/ERP5Type/dynamic/accessor_holder.py +++ b/product/ERP5Type/dynamic/accessor_holder.py @@ -85,7 +85,7 @@ class AccessorHolderType(type): # Set all the accessors (defined by a tuple) from the Property # Holder to the new accessor holder class (code coming from # createAccessor in Base.PropertyHolder) - for id, fake_accessor in property_holder._getItemList(): + for id, fake_accessor in property_holder._getPropertyHolderItemList(): if not isinstance(fake_accessor, tuple): continue