mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fdo#59249: mailmerge.py: some more bytes vs. str mangling"

Browse Source 
This reverts commit 9dec0c7901.

Was nonsense because login method actually expects "str" arguments.
This commit is contained in:
Michael Stahl
2013-01-14 12:22:31 +01:00
parent fabae54c51
commit b08dc0b777
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripting/source/pyprov/mailmerge.py
View File

@@ -103,7 +103,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
password = xAuthenticator.getPassword().encode('ascii') password = xAuthenticator.getPassword().encode('ascii')
if user != b'': if user != b'':
if dbg: 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) self.server.login(user, password)
for listener in self.listeners: for listener in self.listeners:
@@ -137,7 +137,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
bccrecipients = xMailMessage.getBccRecipients() bccrecipients = xMailMessage.getBccRecipients()
if dbg: if dbg:
print("PyMailSMTPService subject " + subject, file=dbgout) 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 from " + sendermail, file=dbgout)
print("PyMailSMTPService send to " + recipients, file=dbgout) print("PyMailSMTPService send to " + recipients, file=dbgout)
@@ -283,7 +283,7 @@ class PyMailIMAPService(unohelper.Base, XMailService):
password = xAuthenticator.getPassword().encode('ascii') password = xAuthenticator.getPassword().encode('ascii')
if user != b'': if user != b'':
if dbg: 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) self.server.login(user, password)
for listener in self.listeners: for listener in self.listeners:
@@ -351,7 +351,7 @@ class PyMailPOP3Service(unohelper.Base, XMailService):
user = xAuthenticator.getUserName().encode('ascii') user = xAuthenticator.getUserName().encode('ascii')
password = xAuthenticator.getPassword().encode('ascii') password = xAuthenticator.getPassword().encode('ascii')
if dbg: 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.user(user)
self.server.pass_(user, password) self.server.pass_(user, password)