diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-01-11 18:29:14 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-01-11 19:10:55 +0100 |
| commit | f49e469d93749547520ae34c52d26f17bcc32cf7 (patch) | |
| tree | 38a8c3bda2553743dcc80593c39e70836016cac4 /scripting | |
| parent | 260f1b19ce7340b02fce5aea948caa61ee128f44 (diff) | |
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 <mstahl@redhat.com>
Diffstat (limited to 'scripting')
| -rwxr-xr-x | scripting/source/pyprov/mailmerge.py | 4 |
1 files 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) |