scripting/source/pyprov/mailmerge.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 6a3c5250066188f127c5445ae1224e19e20ce33a Author: Xisco Fauli <[email protected]> AuthorDate: Mon Oct 30 11:13:06 2017 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Jun 17 22:37:44 2019 +0200 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 <[email protected]> Tested-by: Caolán McNamara <[email protected]> (cherry picked from commit 55ad93f29b1be106a7b475f92202ece3589584d8) Change-Id: If057d0bf8dea55ccddfab8e0f21c8ef16d87dc92 Reviewed-on: https://gerrit.libreoffice.org/74187 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Michael Weghorn <[email protected]> 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" _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
