scripting/source/pyprov/mailmerge.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ac56d9373a66378a04048993ed5aec65cf39f149
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Jan 11 18:32:04 2013 +0100
Can't convert 'Enum' resp. 'bytes' object to str implicitly
...when you set dbg = True
Change-Id: Ifc170e9336a662dce2ae59227baf3bea692eedac
diff --git a/scripting/source/pyprov/mailmerge.py
b/scripting/source/pyprov/mailmerge.py
index cc7a5df..9dce4d3 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,
file=dbgout)
self.server.login(user, password)
for listener in self.listeners:
@@ -381,7 +381,7 @@ class PyMailServiceProvider(unohelper.Base,
XMailServiceProvider):
self.ctx = ctx
def create(self, aType):
if dbg:
- print("PyMailServiceProvider create with " + aType,
file=dbgout)
+ print("PyMailServiceProvider create with", aType,
file=dbgout)
if aType == SMTP:
return PyMailSMTPService(self.ctx);
elif aType == POP3:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
