Merge lp:~cjwatson/launchpadlib/py38-access-token into lp:launchpadlib

[Colin Watson]

Fix AccessToken.from_string crash on Python 3.8.

[Tom Wardill (twom)]

review: Approve

=== modified file 'NEWS.rst'
--- NEWS.rst	2019-11-28 00:07:07 +0000
+++ NEWS.rst	2020-02-04 14:29:20 +0000
@@ -2,6 +2,10 @@
 NEWS for launchpadlib
 =====================
 
+1.10.10
+=======
+- Fix AccessToken.from_string crash on Python 3.8.  [bug=1861873]
+
 1.10.9 (2019-11-28)
 ===================
 - Explicitly install version.txt; launchpadlib requires it.
 
=== modified file 'setup.py'
--- setup.py	2019-11-27 19:40:17 +0000
+++ setup.py	2020-02-04 14:29:20 +0000
@@ -47,6 +47,7 @@
     'lazr.restfulclient>=0.9.19',
     'lazr.uri',
     'setuptools',
+    'six',
     'testresources',
     'wadllib',
     ]
 
=== modified file 'src/launchpadlib/credentials.py'
--- src/launchpadlib/credentials.py	2018-03-07 10:42:12 +0000
+++ src/launchpadlib/credentials.py	2020-02-04 14:29:20 +0000
@@ -29,7 +29,6 @@
     'Credentials',
     ]
 
-import cgi
 try:
     from cStringIO import StringIO
 except ImportError:
@@ -60,6 +59,8 @@
 except ImportError:
     import simplejson as json
 
+from six.moves.urllib.parse import parse_qs
+
 if bytes is str:
     # Python 2
     unicode_type = unicode
@@ -248,7 +249,7 @@
         """Create and return a new `AccessToken` from the given string."""
         if not isinstance(query_string, unicode_type):
             query_string = query_string.decode('utf-8')
-        params = cgi.parse_qs(query_string, keep_blank_values=False)
+        params = parse_qs(query_string, keep_blank_values=False)
         key = params['oauth_token']
         assert len(key) == 1, (
             "Query string must have exactly one oauth_token.")
 
=== modified file 'src/launchpadlib/tests/test_credential_store.py'
--- src/launchpadlib/tests/test_credential_store.py	2014-07-14 20:29:51 +0000
+++ src/launchpadlib/tests/test_credential_store.py	2020-02-04 14:29:20 +0000
@@ -41,6 +41,25 @@
 )
 
 
+class TestAccessToken(unittest.TestCase):
+    """Tests for the AccessToken class."""
+
+    def test_from_string(self):
+        access_token = AccessToken.from_string(
+            "oauth_token_secret=secret%3Dpassword&oauth_token=lock%26key")
+        self.assertEqual("lock&key", access_token.key)
+        self.assertEqual("secret=password", access_token.secret)
+        self.assertIsNone(access_token.context)
+
+    def test_from_string_with_context(self):
+        access_token = AccessToken.from_string(
+            "oauth_token_secret=secret%3Dpassword&oauth_token=lock%26key&"
+            "lp.context=firefox")
+        self.assertEqual("lock&key", access_token.key)
+        self.assertEqual("secret=password", access_token.secret)
+        self.assertEqual("firefox", access_token.context)
+
+
 class CredentialStoreTestCase(unittest.TestCase):
 
     def make_credential(self, consumer_key):