diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-05 14:08:58 +0100 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-05 14:08:58 +0100 |
| commit | 6fde412affb135d14bdcd1d82114fadb02593df0 (patch) | |
| tree | 351a5899addbcc78d66b165a6cb20505841e48e7 | |
| parent | 2a89a06fb04536e2f937326bc22865020970ca02 (diff) | |
| parent | 1351162b3c27354d3e08ad8c249d991012eaa9b6 (diff) | |
CWS-TOOLING: integrate CWS pythonssldedux
| -rw-r--r-- | scripting/source/pyprov/mailmerge.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py index 75d2db533708..c8f7b6765261 100644 --- a/scripting/source/pyprov/mailmerge.py +++ b/scripting/source/pyprov/mailmerge.py @@ -85,8 +85,8 @@ class PyMailSMTPService(unohelper.Base, XSmtpService): self.server.starttls() self.server.ehlo() - user = xAuthenticator.getUserName() - password = xAuthenticator.getPassword() + user = xAuthenticator.getUserName().encode('ascii') + password = xAuthenticator.getPassword().encode('ascii') if user != '': if dbg: print >> sys.stderr, 'Logging in, username of', user @@ -234,8 +234,8 @@ class PyMailIMAPService(unohelper.Base, XMailService): self.server = imaplib.IMAP4(server, port) print >> sys.stderr, "AFTER" - user = xAuthenticator.getUserName() - password = xAuthenticator.getPassword() + user = xAuthenticator.getUserName().encode('ascii') + password = xAuthenticator.getPassword().encode('ascii') if user != '': if dbg: print >> sys.stderr, 'Logging in, username of', user @@ -302,8 +302,8 @@ class PyMailPOP3Service(unohelper.Base, XMailService): self.server = poplib.POP3(server, port) print >> sys.stderr, "AFTER" - user = xAuthenticator.getUserName() - password = xAuthenticator.getPassword() + user = xAuthenticator.getUserName().encode('ascii') + password = xAuthenticator.getPassword().encode('ascii') if dbg: print >> sys.stderr, 'Logging in, username of', user self.server.user(user) |