diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-01-11 18:29:14 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-01-11 18:29:27 +0100 |
| commit | 7a7e19c166df326c45f76a142b478b0629f784c9 (patch) | |
| tree | 5f30c1914cd52570569a3b585f37fdff86c81f9c /scripting/source/pyprov | |
| parent | 194ba3a2cacbb5438dfcb8fb35167055e01ca251 (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
Diffstat (limited to 'scripting/source/pyprov')
| -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 e87f9a5734e0..cc7a5dfa2778 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) |