[Erp5-report] r25736 - /erp5/trunk/products/ERP5/Document/WebSection.py

[nobody at svn.erp5.org]

Author: yusei
Date: Fri Feb 27 09:08:36 2009
New Revision: 25736

URL: http://svn.erp5.org?rev=25736&view=rev
Log:
Return default value if key does not exist. By Python language convention,
a method named getXXX should not raise an exception even if key does not exist.

Modified:
    erp5/trunk/products/ERP5/Document/WebSection.py

Modified: erp5/trunk/products/ERP5/Document/WebSection.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/WebSection.py?rev=25736&r1=25735&r2=25736&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/WebSection.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/WebSection.py [utf8] Fri Feb 27 09:08:36 2009
@@ -118,7 +118,7 @@
       return PermanentURLMixIn.__bobo_traverse__(self, request, name)
 
     security.declareProtected(Permissions.AccessContentsInformation, 'getLayoutProperty')
-    def getLayoutProperty(self, key, d=MARKER):
+    def getLayoutProperty(self, key, default=None):
       """
         A simple method to get a property of the current by
         acquiring it from the current section or its parents.
@@ -129,12 +129,7 @@
         if result is not MARKER and result:
           return result
         section = section.aq_parent
-      # No property was defined on children neither on web site
-      # If a default is provided, return it
-      # else raise
-      if d is not MARKER:
-        return d
-      raise AttributeError('Web Section %s has no layout property %s' % (self.getUrl(), key))
+      return default
 
     security.declareProtected(Permissions.AccessContentsInformation, 'getWebSectionValue')
     def getWebSectionValue(self):