summaryrefslogtreecommitdiff
path: root/scripting
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2020-04-04 19:05:00 +0200
committerMichael Stahl <michael.stahl@cib.de>2020-04-06 11:02:41 +0200
commiteba46261c435b2ae898dd50de664a7f88006fa67 (patch)
treed0b4a0d4d7bb91068497d2621351a2a1bac385d3 /scripting
parent0da05130dab54fc29ed51a62ad95d13d063e2519 (diff)
scripting: mailmerge.py: remove Python 3.0/3.1 support
Change-Id: I934b8f07f99aca1cbc7489f019c905a79acab258 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91695 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'scripting')
-rw-r--r--scripting/source/pyprov/mailmerge.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py
index fadceb1e1e56..e41f44d965bd 100644
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -199,14 +199,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
#it's a bytesequence, get raw bytes
textbody = textbody.value
if sys.version_info >= (3,0):
- if sys.version_info <= (3,1):
- #http://stackoverflow.com/questions/9403265/how-do-i-use-python-3-2-email-module-to-send-unicode-messages-encoded-in-utf-8-w
- #see http://bugs.python.org/16564, etc. basically it now *seems* to be all ok
- #in python 3.3.2 onwards, but a little busted in 3.3.0
-
- textbody = textbody.decode('iso8859-1')
- else:
- textbody = textbody.decode('utf-8')
+ textbody = textbody.decode('utf-8')
c = Charset('utf-8')
c.body_encoding = QP
textmsg.set_payload(textbody, c)