diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-01-11 19:07:08 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-01-11 19:08:24 +0100 |
| commit | 9dec0c79011a0c09068d86fba9387c67da84a39b (patch) | |
| tree | 960f7a830cba8fb421e66523e988039cdde0a916 /scripting | |
| parent | f902073e4790ab3de1d48758d4e38ba583809030 (diff) | |
fdo#59249: mailmerge.py: some more bytes vs. str mangling
Obvious problems are in debug code only.
Change-Id: I45aafb4f194a5a020bb95bd96c2d92ca7ee578f8
Diffstat (limited to 'scripting')
| -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 9dce4d307955..cfbe76157d7c 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, file=dbgout) + print("Logging in, username of" + user.decode('ascii'), 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.encode('utf-8'), file=dbgout) + print("PyMailSMTPService from " + sendername, 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, file=dbgout) + print("Logging in, username of" + user.decode('ascii'), 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, file=dbgout) + print("Logging in, username of" + user.decode('ascii'), file=dbgout) self.server.user(user) self.server.pass_(user, password) |