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

[nobody at svn.erp5.org]

Author: nicolas
Date: Fri Jul 11 10:04:20 2008
New Revision: 22433

URL: http://svn.erp5.org?rev=22433&view=rev
Log:
Handle non-exist encoding

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=22433&r1=22432&r2=22433&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/EmailDocument.py (original)
+++ erp5/trunk/products/ERP5/Document/EmailDocument.py Fri Jul 11 10:04:20 2008
@@ -281,7 +281,7 @@
         if part_encoding not in (None, 'utf-8',):
           try:
             text_result = part.get_payload(decode=1).decode(part_encoding).encode('utf-8')
-          except UnicodeDecodeError:
+          except (UnicodeDecodeError, LookupError):
             text_result = part.get_payload(decode=1)
         else:
           text_result = part.get_payload(decode=1)
@@ -290,7 +290,7 @@
         if part_encoding not in (None, 'utf-8',):
           try:
             return part.get_payload(decode=1).decode(part_encoding).encode('utf-8')
-          except UnicodeDecodeError:
+          except (UnicodeDecodeError, LookupError):
             return part.get_payload(decode=1)
         return part.get_payload(decode=1)
     return text_result