diff options
| author | Xisco Fauli <anistenis@gmail.com> | 2017-10-30 11:13:06 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-12-02 16:02:54 +0100 |
| commit | d1ae11a43d72e24bab9009d35db3d1a8b622d29e (patch) | |
| tree | a5cad3444b772011d3c03c26e4d2b0225cb94502 | |
| parent | eeab393fe392dd558beadb89ed7b1b541481b732 (diff) | |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 55ad93f29b1be106a7b475f92202ece3589584d8)
Reviewed-on: https://gerrit.libreoffice.org/45694
| -rw-r--r-- | scripting/source/pyprov/mailmerge.py | 4 |
1 files changed, 2 insertions, 2 deletions
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" |