From 350994ffdc51787ecd51a8b7ce4e504c2432dd9d Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 17 Jun 2013 11:08:15 +0100 Subject: Resolves: fdo#55411 python 2 vs 3 str/bytes encoding issues Change-Id: Ic1aac1609f3a1fcbd0af9a1c9ecc07a735c8785a (cherry picked from commit 06f22f5ae0eafe094b280f03c770eebdbb33d403) Reviewed-on: https://gerrit.libreoffice.org/4351 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba --- scripting/source/pyprov/mailmerge.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py index 18b476c26a17..f70f034c3569 100755 --- a/scripting/source/pyprov/mailmerge.py +++ b/scripting/source/pyprov/mailmerge.py @@ -239,11 +239,14 @@ class PyMailSMTPService(unohelper.Base, XSmtpService): encode_base64(msgattachment) fname = attachment.ReadableName try: - fname.encode('ascii') + msgattachment.add_header('Content-Disposition', 'attachment', \ + filename=fname) except: - fname = ('utf-8','',fname.encode('utf-8')) - msgattachment.add_header('Content-Disposition', 'attachment', \ - filename=fname) + msgattachment.add_header('Content-Disposition', 'attachment', \ + filename=('utf-8','',fname)) + if dbg: + print(("PyMailSMTPService attachmentheader: ", str(msgattachment)), file=dbgout) + msg.attach(msgattachment) uniquer = {} -- cgit v1.2.3