[Erp5-report] r7718 - /erp5/trunk/products/ERP5Type/Base.py

[nobody at svn.erp5.org]

Author: thomas
Date: Wed Jun 14 17:13:10 2006
New Revision: 7718

URL: http://svn.erp5.org?rev=7718&view=rev
Log:
Last commited patch 7710 seems to generate errors in a lot of cases.
comming back to previous release as it should not be a good idea to be
able to do a setProperty to get an object attribute.

Modified:
    erp5/trunk/products/ERP5Type/Base.py

Modified: erp5/trunk/products/ERP5Type/Base.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Base.py?rev=7718&r1=7717&r2=7718&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Base.py (original)
+++ erp5/trunk/products/ERP5Type/Base.py Wed Jun 14 17:13:10 2006
@@ -780,8 +780,7 @@
         return default_value
 
   security.declareProtected( Permissions.AccessContentsInformation, 'getProperty' )
-  _marker=[]
-  def getProperty(self, key, d=_marker, **kw):
+  def getProperty(self, key, d=None, **kw):
     """
       Previous Name: getValue
 
@@ -802,11 +801,7 @@
       method = getattr(self, accessor_name)
       return method(**kw)
     else:
-      value = ERP5PropertyManager.getProperty(self, key, d=d, **kw)
-      if value is self._marker:
-	return getattr(self,key)
-      else:
-	return getattr(self,key,d)
+      return ERP5PropertyManager.getProperty(self, key, d=d, **kw)
 
   security.declareProtected( Permissions.AccessContentsInformation, 'getPropertyList' )
   def getPropertyList(self, key, d=None):