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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Aug 13 10:20:21 2009
New Revision: 28361

URL: http://svn.erp5.org?rev=28361&view=rev
Log:
return None instead of calling str() if _baseGet*()'s value is None in getBaseData() and getData(). thanks to Romain for reporting the bug.

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

Modified: erp5/trunk/products/ERP5/Document/Document.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Document.py?rev=28361&r1=28360&r2=28361&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Document.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Document.py [utf8] Thu Aug 13 10:20:21 2009
@@ -1392,7 +1392,11 @@
                             'getBaseData')
   def getBaseData(self, default=None):
     """return BaseData as str."""
-    return str(self._baseGetBaseData())
+    base_data = self._baseGetBaseData()
+    if base_data is None:
+      return None
+    else:
+      return str(base_data)
 
   security.declareProtected(Permissions.ModifyPortalContent, '_setData')
   def _setData(self, data):
@@ -1401,4 +1405,8 @@
   security.declareProtected(Permissions.AccessContentsInformation, 'getData')
   def getData(self, default=None):
     """return Data as str."""
-    return str(self._baseGetData())
+    data = self._baseGetData()
+    if data is None:
+      return None
+    else:
+      return str(data)