summaryrefslogtreecommitdiff
path: root/scripting
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-01-14 12:55:42 +0100
committerMichael Stahl <mstahl@redhat.com>2013-01-14 20:06:08 +0100
commit907b63a0f3f754d4a975717ffec9cbc03214f0f3 (patch)
tree4ae6d1cd6f007ebe970f8da78345261f9545c8df /scripting
parentc5192576bfe0d61302cc2fcbf870e8ec6d870d8e (diff)
mailmerge.py: fix the debug strings again
Change-Id: Iceac0952b6fc9765cb12f6694260070c1c17296b
Diffstat (limited to 'scripting')
-rwxr-xr-xscripting/source/pyprov/mailmerge.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py
index b550c306d0fb..15fcf02d0e63 100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -140,7 +140,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)
@@ -289,7 +289,7 @@ class PyMailIMAPService(unohelper.Base, XMailService):
user = user.encode('ascii')
password = password.encode('ascii')
if dbg:
- print("Logging in, username of" + user, file=dbgout)
+ print("Logging in, username of", user, file=dbgout)
self.server.login(user, password)
for listener in self.listeners:
@@ -360,7 +360,7 @@ class PyMailPOP3Service(unohelper.Base, XMailService):
user = user.encode('ascii')
password = password.encode('ascii')
if dbg:
- print("Logging in, username of" + user, file=dbgout)
+ print("Logging in, username of", user, file=dbgout)
self.server.user(user)
self.server.pass_(user, password)