From 10e07b293b3aecf9c3f3db32a73068b9a95be4c4 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 5 Nov 2014 10:10:43 +0100 Subject: [PATCH] Convert to string if necessary. --- modoboa/lib/emailutils.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modoboa/lib/emailutils.py b/modoboa/lib/emailutils.py index 234259e5d..425c898d8 100644 --- a/modoboa/lib/emailutils.py +++ b/modoboa/lib/emailutils.py @@ -68,9 +68,13 @@ class Email(object): """ fname = msg.get_filename() if fname is not None: + if type(fname) is unicode: + fname = fname.encode("utf-8") decoded = decode_header(fname) - value = decoded[0][1] is None and decoded[0][0] \ - or unicode(decoded[0][0], decoded[0][1]) + value = ( + decoded[0][0] if decoded[0][1] is None + else unicode(decoded[0][0], decoded[0][1]) + ) else: value = "part_%s" % level self.attachments[level] = value