diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2012-01-25 07:36:15 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-01-15 14:58:05 +0000 |
| commit | a5cefd4007be4789f550ee559aa832ddb04c2dc3 (patch) | |
| tree | d88ddb86328827666ed604606dea8b4c85731397 /scripting | |
| parent | 3f2f92b753474883b5cd97aff3e00ac55fd23f3f (diff) | |
i118791 - Encode ReadableName in UTF-8 only when necessary
Conflicts:
scripting/source/pyprov/mailmerge.py
Change-Id: I5275bdbbc21f422248a32b824ea6de965c23abd0
Diffstat (limited to 'scripting')
| -rwxr-xr-x | scripting/source/pyprov/mailmerge.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py index e7c30ac7b247..40a62f35a378 100755 --- a/scripting/source/pyprov/mailmerge.py +++ b/scripting/source/pyprov/mailmerge.py @@ -219,8 +219,13 @@ class PyMailSMTPService(unohelper.Base, XSmtpService): data = content.getTransferData(flavor) msgattachment.set_payload(data) encode_base64(msgattachment) + fname = attachment.ReadableName + try: + fname.encode('ascii') + except: + fname = ('utf-8','',fname.encode('utf-8')) msgattachment.add_header('Content-Disposition', 'attachment', \ - filename=('utf-8','',attachment.ReadableName.encode('utf-8'))) + filename=fname) msg.attach(msgattachment) |