Commit dac2ad79 authored by Nicolas Dumazet's avatar Nicolas Dumazet

* change PropertyHolder-related constants into class attributes

* add __ac_permissions__ to list of reserved attributes
* make PropertyHolder a newstyle class


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@42795 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent f6b7d16d
No related merge requests found
...@@ -310,15 +310,14 @@ def _aq_reset(): ...@@ -310,15 +310,14 @@ def _aq_reset():
global method_registration_cache global method_registration_cache
method_registration_cache = {} method_registration_cache = {}
WORKFLOW_METHOD_MARKER = ('Base._doNothing',)
RESERVED_TUPLE_PROPERTY = set(('_constraints', '_properties', '_categories',
'__implements__', 'property_sheets',
'_erp5_properties'))
# It might be necessary to use another type for those reserved properties
# ex. list type
class PropertyHolder: class PropertyHolder(object):
isRADContent = 1 isRADContent = 1
WORKFLOW_METHOD_MARKER = ('Base._doNothing',)
RESERVED_PROPERTY_SET = set(('_constraints', '_properties', '_categories',
'__implements__', 'property_sheets',
'__ac_permissions__',
'_erp5_properties'))
def __init__(self): def __init__(self):
self.__name__ = 'PropertyHolder' self.__name__ = 'PropertyHolder'
...@@ -327,7 +326,7 @@ class PropertyHolder: ...@@ -327,7 +326,7 @@ class PropertyHolder:
def _getItemList(self): def _getItemList(self):
return [x for x in self.__dict__.items() if x[0] not in return [x for x in self.__dict__.items() if x[0] not in
RESERVED_TUPLE_PROPERTY] PropertyHolder.RESERVED_PROPERTY_SET]
# Accessor generation # Accessor generation
def createAccessor(self, id): def createAccessor(self, id):
...@@ -336,7 +335,7 @@ class PropertyHolder: ...@@ -336,7 +335,7 @@ class PropertyHolder:
""" """
fake_accessor = getattr(self, id) fake_accessor = getattr(self, id)
ptype = self._portal_type ptype = self._portal_type
if fake_accessor is WORKFLOW_METHOD_MARKER: if fake_accessor is PropertyHolder.WORKFLOW_METHOD_MARKER:
# Case 1 : a workflow method only # Case 1 : a workflow method only
accessor = Base._doNothing accessor = Base._doNothing
else: else:
...@@ -411,7 +410,7 @@ class PropertyHolder: ...@@ -411,7 +410,7 @@ class PropertyHolder:
if signature not in signature_list: if signature not in signature_list:
self.workflow_method_registry[id] = signature_list + (signature,) self.workflow_method_registry[id] = signature_list + (signature,)
if getattr(self, id, None) is None: if getattr(self, id, None) is None:
setattr(self, id, WORKFLOW_METHOD_MARKER) setattr(self, id, PropertyHolder.WORKFLOW_METHOD_MARKER)
def declareProtected(self, permission, accessor_name): def declareProtected(self, permission, accessor_name):
""" """
...@@ -435,7 +434,7 @@ class PropertyHolder: ...@@ -435,7 +434,7 @@ class PropertyHolder:
accessor_method_item_list_append = accessor_method_item_list.append accessor_method_item_list_append = accessor_method_item_list.append
for x, y in self._getItemList(): for x, y in self._getItemList():
if isinstance(y, tuple): if isinstance(y, tuple):
if y is WORKFLOW_METHOD_MARKER or x == '__ac_permissions__': if y is PropertyHolder.WORKFLOW_METHOD_MARKER or x == '__ac_permissions__':
continue continue
if len(y) == 0: if len(y) == 0:
raise ValueError("problem at %s %s" % (self._portal_type, x)) raise ValueError("problem at %s %s" % (self._portal_type, x))
...@@ -458,7 +457,7 @@ class PropertyHolder: ...@@ -458,7 +457,7 @@ class PropertyHolder:
""" """
return [x for x in self._getItemList() if isinstance(x[1], WorkflowMethod) return [x for x in self._getItemList() if isinstance(x[1], WorkflowMethod)
or (isinstance(x[1], types.TupleType) or (isinstance(x[1], types.TupleType)
and x[1] is WORKFLOW_METHOD_MARKER)] and x[1] is PropertyHolder.WORKFLOW_METHOD_MARKER)]
def getWorkflowMethodIdList(self): def getWorkflowMethodIdList(self):
""" """
...@@ -956,7 +955,7 @@ class Base( CopyContainer, ...@@ -956,7 +955,7 @@ class Base( CopyContainer,
pass pass
else: else:
accessor = getattr(property_holder, id, None) accessor = getattr(property_holder, id, None)
if type(accessor) is tuple and id not in RESERVED_TUPLE_PROPERTY: if type(accessor) is tuple and id not in PropertyHolder.RESERVED_PROPERTY_SET:
accessor = property_holder.createAccessor(id) accessor = property_holder.createAccessor(id)
return accessor return accessor
......
...@@ -222,7 +222,7 @@ class PropertySheetTool(BaseTool): ...@@ -222,7 +222,7 @@ class PropertySheetTool(BaseTool):
if not isinstance(fake_accessor, tuple): if not isinstance(fake_accessor, tuple):
continue continue
if fake_accessor is ('Base._doNothing',): if fake_accessor is PropertyHolder.WORKFLOW_METHOD_MARKER:
# Case 1 : a workflow method only # Case 1 : a workflow method only
accessor = Base._doNothing accessor = Base._doNothing
else: else:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment