diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-07-13 15:56:41 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-07-13 17:21:01 +0000 |
| commit | 820fe067c0ede36f357fb214d0298e3caaff512f (patch) | |
| tree | e0d2ffa5d7b3d685cc18556ca1106b2a311d9a4c /scripting | |
| parent | 6089121ebd075bb6422d33d6bff69dff2e88efb2 (diff) | |
Resolves: fdo#66761 Macro controlled Python Mailmerge broken
Change-Id: Id8bbf06a5571534aa5eef8624e89565fe3715938
(cherry picked from commit c4aa13c931da11164835a7aafbfd7e44bd5714ca)
Reviewed-on: https://gerrit.libreoffice.org/4883
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'scripting')
| -rwxr-xr-x | scripting/source/pyprov/mailmerge.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py index f70f034c3569..af10dbe4a967 100755 --- a/scripting/source/pyprov/mailmerge.py +++ b/scripting/source/pyprov/mailmerge.py @@ -181,7 +181,10 @@ class PyMailSMTPService(unohelper.Base, XSmtpService): textmsg['Content-Type'] = mimeEncoding textmsg['MIME-Version'] = '1.0' - textbody = textbody.encode('utf-8') + try: + textbody = textbody.encode('utf-8') + except: + textbody = str(textbody.value).encode('utf-8') if sys.version >= '3': #http://stackoverflow.com/questions/9403265/how-do-i-use-python-3-2-email-module-to-send-unicode-messages-encoded-in-utf-8-w textbody = textbody.decode('iso8859-1') |