[Erp5-report] r23240 - /erp5/trunk/products/ERP5/Document/EmailDocument.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Aug 28 16:29:04 CEST 2008
Author: nicolas
Date: Thu Aug 28 16:29:00 2008
New Revision: 23240
URL: http://svn.erp5.org?rev=23240&view=rev
Log:
default value should be return if mail content is empty
Modified:
erp5/trunk/products/ERP5/Document/EmailDocument.py
Modified: erp5/trunk/products/ERP5/Document/EmailDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/EmailDocument.py?rev=23240&r1=23239&r2=23240&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/EmailDocument.py (original)
+++ erp5/trunk/products/ERP5/Document/EmailDocument.py Thu Aug 28 16:29:00 2008
@@ -295,11 +295,15 @@
part_encoding = part.get_content_charset()
if part_encoding not in (None, 'utf-8',):
try:
- return part.get_payload(decode=1).decode(part_encoding).encode('utf-8')
+ text_result = part.get_payload(decode=1).\
+ decode(part_encoding).encode('utf-8')
except (UnicodeDecodeError, LookupError):
- return part.get_payload(decode=1)
- return part.get_payload(decode=1)
- return text_result
+ text_result = part.get_payload(decode=1)
+ else:
+ text_result = part.get_payload(decode=1)
+ if default is _MARKER:
+ return text_result
+ return text_result or default
security.declareProtected(Permissions.AccessContentsInformation, 'getTextFormat')
def getTextFormat(self, default=_MARKER):
More information about the Erp5-report
mailing list