[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - scripting/source

[Xisco Fauli]

 scripting/source/pyprov/mailmerge.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d1ae11a43d72e24bab9009d35db3d1a8b622d29e
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Mon Oct 30 11:13:06 2017 +0100

    mailmerge.py: Use strip in server name
    
    Using spaces in the dialog might lead to  incorrect server name
    Change-Id: I29a1ffa867d2e415338accf98bb45c7d65b14fa2
    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)
    Reviewed-on: https://gerrit.libreoffice.org/45694

diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py
index 235472b2a85d..6034a74f1b03 100644
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -91,7 +91,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"))
@@ -405,7 +405,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"