[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-4-1-6+backports' - 2 commits - python3/ExternalPackage_python3.mk scripting/source

[Xisco Fauli (via logerrit)]

 python3/ExternalPackage_python3.mk   |    1 +
 scripting/source/pyprov/mailmerge.py |    5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit d2ce23fcb27bcdbf4883950b1cd8dcf830d4b3fd
Author:     Xisco Fauli <anistenis at gmail.com>
AuthorDate: Mon Oct 30 11:13:06 2017 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Tue Jun 18 13:25:26 2019 +0000

    mailmerge.py: Use strip in server name
    
    Using spaces in the dialog might lead to  incorrect server name
    Reviewed-on: https://gerrit.libreoffice.org/44052
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    
    (cherry picked from commit 55ad93f29b1be106a7b475f92202ece3589584d8)
    
    Change-Id: If057d0bf8dea55ccddfab8e0f21c8ef16d87dc92
    Reviewed-on: https://gerrit.libreoffice.org/74187
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    Tested-by: Michael Weghorn <m.weghorn at posteo.de>
    (cherry picked from commit 6a3c5250066188f127c5445ae1224e19e20ce33a)

diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py
index e0dd1b5154f6..ed20e625aaeb 100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -84,7 +84,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
 		self.connectioncontext = xConnectionContext
 		if dbg:
 			print("PyMailSMTPService connect", file=dbgout)
-		server = xConnectionContext.getValueByName("ServerName")
+		server = xConnectionContext.getValueByName("ServerName").strip()
 		if dbg:
 			print("ServerName: " + server, file=dbgout)
 		port = int(xConnectionContext.getValueByName("Port"))
@@ -398,7 +398,7 @@ class PyMailPOP3Service(unohelper.Base, XMailService):
 				print("Timeout: " + str(tout), file=dbgout)
 			self.server = poplib.POP3(server, port, timeout=tout)
 		print("AFTER", file=dbgout)
-			
+
 		user = xAuthenticator.getUserName()
 		password = xAuthenticator.getPassword()
 		if sys.version < '3': # fdo#59249 i#105669 Python 2 needs "ascii"
commit a3d465a40c3eb1cb8c4ce9efbf7c8394fb19991b
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sun Dec 18 19:17:53 2016 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Tue Jun 18 13:25:25 2019 +0000

    tdf#103363: add unicodedata and import idna encoding for mailmerge
    
    Thank you Moggi for your help on how to add unicodedata module to Python!
    
    Reviewed-on: https://gerrit.libreoffice.org/32140
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 486efbfc74890582b16f858b8e937d4ae9b66f64)
    
    Reviewed-on: https://gerrit.libreoffice.org/74186
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    Tested-by: Michael Weghorn <m.weghorn at posteo.de>
    (cherry picked from commit 6459ec8046231e258d380efcdaac0a5def23276f)
    
     Conflicts:
            external/python3/ExternalPackage_python3.mk
    
    Change-Id: I1b5b0cb622eb9663d836b773d44a05efc9a59535

diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk
index 3a36d4e33fde..ed758725e7d3 100644
--- a/python3/ExternalPackage_python3.mk
+++ b/python3/ExternalPackage_python3.mk
@@ -109,6 +109,7 @@ $(eval $(call gb_ExternalPackage_add_files,python3,$(gb_Package_PROGRAMDIRNAME)/
 	LO_lib/_testbuffer.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
 	LO_lib/_testcapi.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
 	LO_lib/time.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/unicodedata.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
 	LO_lib/zlib.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
 ))
 endif
diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py
index 3cfb6d3175eb..e0dd1b5154f6 100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -17,6 +17,7 @@ import unohelper
 import uno
 import re
 import os
+import encodings.idna
 
 #to implement com::sun::star::mail::XMailServiceProvider
 #and