Merge lp:~openerp-dev/openobject-addons/trunk-bug-1204608-dharmraj into lp:openobject-addons

[Pariket Trivedi(OpenERP)]

hello all,

I have fixed issue when incoming e-mail is fetched with a special sign or other language attachments,
file are not properly display in cheater.

Thank you,
ptr

Unmerged revisions

8854. By Pariket Trivedi(OpenERP) on 2014-01-01

[IMP] add condition check attachments filename is string so decode string.

8853. By Pariket Trivedi(OpenERP) on 2014-01-01

[MERGE]:merged with trunk.

8852. By Dharmraj Zala(OpenERP) on 2013-08-13

[FIX] attachments with special characters will be displayed properly

=== modified file 'mail/mail_thread.py'
--- mail/mail_thread.py	2013-12-09 10:50:31 +0000
+++ mail/mail_thread.py	2014-01-15 16:15:22 +0000
@@ -1119,7 +1119,7 @@
                 encoding = part.get_content_charset()  # None if attachment
                 # 1) Explicit Attachments -> attachments
                 if filename or part.get('content-disposition', '').strip().startswith('attachment'):
-                    attachments.append((decode(filename) or 'attachment', part.get_payload(decode=True)))
+                    attachments.append((decode(filename) if isinstance(filename, str) else filename or 'attachment', part.get_payload(decode=True)))
                     continue
                 # 2) text/plain -> <pre/>
                 if part.get_content_type() == 'text/plain' and (not alternative or not body):
@@ -1134,7 +1134,7 @@
                         body = tools.append_content_to_html(body, html, plaintext=False)
                 # 4) Anything else -> attachment
                 else:
-                    attachments.append((filename or 'attachment', part.get_payload(decode=True)))
+                    attachments.append((decode(filename) if isinstance(filename, str) else filename or 'attachment', part.get_payload(decode=True)))
         return body, attachments
 
     def message_parse(self, cr, uid, message, save_original=False, context=None):