From e814892c8884fdfc5548e659d5b7ee9ac7d7ea93 Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Sat, 13 Aug 2016 04:12:42 +0100
Subject: Make sure query_string is str, before decoding.

Origin: commit, revision id: xnox@ubuntu.com-20160813025000-y92qzzkalwf92n9c
Author: Dimitri John Ledkov <xnox@ubuntu.com>
Bug: https://launchpad.net/bugs/1471927
Last-Update: 2016-08-13
X-Bzr-Revision-Id: xnox@ubuntu.com-20160813025000-y92qzzkalwf92n9c
---
 src/launchpadlib/credentials.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/launchpadlib/credentials.py b/src/launchpadlib/credentials.py
index c0ab813..bb4f74a 100644
--- a/src/launchpadlib/credentials.py
+++ b/src/launchpadlib/credentials.py
@@ -248,6 +248,8 @@ class AccessToken(_AccessToken):
     @classmethod
     def from_string(cls, query_string):
         """Create and return a new `AccessToken` from the given string."""
+        if not isinstance(query_string, str):
+            query_string = query_string.decode('utf-8')
         params = cgi.parse_qs(query_string, keep_blank_values=False)
         key = params['oauth_token']
         assert len(key) == 1, (
