diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-01-14 12:22:31 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-01-14 12:40:40 +0100 |
| commit | b08dc0b7777f48cef97e90ae1f4633591add680b (patch) | |
| tree | e4086a13f1649ac823f2da9cc0dbcd1d09c7ae53 /scripting/source/pyprov/mailmerge.py | |
| parent | fabae54c51c25dcb28febe8181de8a5ee360ce1b (diff) | |
Revert "fdo#59249: mailmerge.py: some more bytes vs. str mangling"
This reverts commit 9dec0c79011a0c09068d86fba9387c67da84a39b.
Was nonsense because login method actually expects "str" arguments.
Diffstat (limited to 'scripting/source/pyprov/mailmerge.py')
| -rwxr-xr-x | scripting/source/pyprov/mailmerge.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py index cfbe76157d7c..9dce4d307955 100755 --- a/scripting/source/pyprov/mailmerge.py +++ b/scripting/source/pyprov/mailmerge.py @@ -103,7 +103,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService): password = xAuthenticator.getPassword().encode('ascii') if user != b'': if dbg: - print("Logging in, username of" + user.decode('ascii'), file=dbgout) + print("Logging in, username of", user, file=dbgout) self.server.login(user, password) for listener in self.listeners: @@ -137,7 +137,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService): bccrecipients = xMailMessage.getBccRecipients() if dbg: print("PyMailSMTPService subject " + subject, file=dbgout) - print("PyMailSMTPService from " + sendername, file=dbgout) + print("PyMailSMTPService from " + sendername.encode('utf-8'), file=dbgout) print("PyMailSMTPService from " + sendermail, file=dbgout) print("PyMailSMTPService send to " + recipients, file=dbgout) @@ -283,7 +283,7 @@ class PyMailIMAPService(unohelper.Base, XMailService): password = xAuthenticator.getPassword().encode('ascii') if user != b'': if dbg: - print("Logging in, username of" + user.decode('ascii'), file=dbgout) + print("Logging in, username of" + user, file=dbgout) self.server.login(user, password) for listener in self.listeners: @@ -351,7 +351,7 @@ class PyMailPOP3Service(unohelper.Base, XMailService): user = xAuthenticator.getUserName().encode('ascii') password = xAuthenticator.getPassword().encode('ascii') if dbg: - print("Logging in, username of" + user.decode('ascii'), file=dbgout) + print("Logging in, username of" + user, file=dbgout) self.server.user(user) self.server.pass_(user, password) |