Merge lp:~smoser/launchpadlib/trunk.lp-1685962 into lp:launchpadlib

[Scott Moser]

[Dimitri John Ledkov (xnox)]

is launchpadlib python3 only these days? i thought we have a special helper in there somewhere to do these decodes by default. As i believe you want unicode for py2, and string for py3, no?

[Colin Watson (cjwatson)]

unicode for py2 and string for py3 is exactly what .decode('utf-8') gives you.

This is fine; it's been in my working copy for a while too, but I'd forgotten to actually push it forward :-)

review: Approve

=== modified file 'src/launchpadlib/credentials.py'
--- src/launchpadlib/credentials.py	2016-08-15 10:32:44 +0000
+++ src/launchpadlib/credentials.py	2018-03-07 10:46:58 +0000
@@ -380,7 +380,7 @@
         # this problem by base 64 encoding the serialized value.
         serialized = self.B64MARKER + b64encode(serialized)
         keyring.set_password(
-            'launchpadlib', unique_key, serialized)
+            'launchpadlib', unique_key, serialized.decode('utf-8'))
 
     def do_load(self, unique_key):
         """Retrieve credentials from the keyring."""