From f49e469d93749547520ae34c52d26f17bcc32cf7 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 11 Jan 2013 18:29:14 +0100 Subject: fdo#59249: String literal needs a "b" prefix in Pyhton 3 as the corresponding test is otherwise seen to fail, with user being b, but I have no idea if this is the most Python-3-ish approach to fix that, or whether more code needs to be fixed, too. Change-Id: Ia7fbcbca3cf578ffe1bd5ce3c7c5b709cc77317e (cherry picked from commit 7a7e19c166df326c45f76a142b478b0629f784c9) Signed-off-by: Michael Stahl --- scripting/source/pyprov/mailmerge.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py index 236bea1f6020..d76322e14aa9 100755 --- a/scripting/source/pyprov/mailmerge.py +++ b/scripting/source/pyprov/mailmerge.py @@ -101,7 +101,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService): user = xAuthenticator.getUserName().encode('ascii') password = xAuthenticator.getPassword().encode('ascii') - if user != '': + if user != b'': if dbg: print("Logging in, username of" + user, file=dbgout) self.server.login(user, password) @@ -281,7 +281,7 @@ class PyMailIMAPService(unohelper.Base, XMailService): user = xAuthenticator.getUserName().encode('ascii') password = xAuthenticator.getPassword().encode('ascii') - if user != '': + if user != b'': if dbg: print("Logging in, username of" + user, file=dbgout) self.server.login(user, password) -- cgit v1.2.3