diff --git a/product/CMFActivity/ActiveResult.py b/product/CMFActivity/ActiveResult.py index 9ab3d109365308d5553dc687ab5c52f43f7a9e25..976bd26cf8dfd084058c63a89580cf3956055f8c 100644 --- a/product/CMFActivity/ActiveResult.py +++ b/product/CMFActivity/ActiveResult.py @@ -48,6 +48,8 @@ class ActiveResult: WARNING = 100 ERROR = 200 PANIC = 300 + # getProperty default + _MARKER = None def __init__(self,summary='',severity=INFO,detail='',**kw): """ @@ -70,11 +72,11 @@ class ActiveResult: del kw['object_path'] self.__dict__.update(kw) - def getProperty(self,value): + def getProperty(self,value,d=_MARKER,**kw): """ A simple getter """ - return getattr(self,value,None) + return getattr(self,value,d) def getResult(self): """ diff --git a/product/ERP5Type/Error.py b/product/ERP5Type/Error.py index 232fae8259b52127c6ab3294b4eaa3fd7f6cefd8..095b5e3c91bdd3decbdeb46eec3d037e70dbb058 100644 --- a/product/ERP5Type/Error.py +++ b/product/ERP5Type/Error.py @@ -43,6 +43,8 @@ class Error: WARNING = 100 ERROR = 200 PANIC = 300 + # Marker for getProperty + _MARKER = None def __init__(self,summary='',severity=INFO,detail='',**kw): """ @@ -65,10 +67,10 @@ class Error: del kw['object_path'] self.__dict__.update(kw) - def getProperty(self,value): + def getProperty(self, key, d=_MARKER, **kw): """ A simple getter """ - return getattr(self,value,None) + return getattr(self, value, d) allow_class(Error)