[Libreoffice-commits] .: scripting/source

[Libreoffice Gerrit user]

 scripting/source/pyprov/mailmerge.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9dec0c79011a0c09068d86fba9387c67da84a39b
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jan 11 19:07:08 2013 +0100

    fdo#59249: mailmerge.py: some more bytes vs. str mangling
    
    Obvious problems are in debug code only.
    
    Change-Id: I45aafb4f194a5a020bb95bd96c2d92ca7ee578f8

diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py
index 9dce4d3..cfbe761 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)