Merge lp:~zyga/launchpadlib/fix-1471894 into lp:launchpadlib

[Zygmunt Krynicki]

[Colin Watson (cjwatson)]

review: Approve

[Dimitri John Ledkov (xnox)]

review: Approve

=== modified file 'src/launchpadlib/launchpad.py'
--- src/launchpadlib/launchpad.py	2014-12-05 23:21:40 +0000
+++ src/launchpadlib/launchpad.py	2015-07-06 18:03:00 +0000
@@ -122,9 +122,9 @@
     def _bad_oauth_token(self, response, content):
         """Helper method to detect an error caused by a bad OAuth token."""
         return (response.status == 401 and
-                (content.startswith("Expired token")
-                 or content.startswith("Invalid token")
-                 or content.startswith("Unknown access token")))
+                (content.startswith(b"Expired token")
+                 or content.startswith(b"Invalid token")
+                 or content.startswith(b"Unknown access token")))
 
     def _request(self, *args):
         response, content = super(

=== modified file 'src/launchpadlib/tests/test_http.py'
--- src/launchpadlib/tests/test_http.py	2014-07-04 16:26:26 +0000
+++ src/launchpadlib/tests/test_http.py	2015-07-06 18:03:00 +0000
@@ -39,7 +39,7 @@
 
 
 # The simplest WADL that looks like a representation of the service root.
-SIMPLE_WADL = '''<?xml version="1.0"?>
+SIMPLE_WADL = b'''<?xml version="1.0"?>
 <application xmlns="http://research.sun.com/wadl/2006/10">
   <resources base="http://www.example.com/">
     <resource path="" type="#service-root"/>
@@ -58,7 +58,7 @@
 '''
 
 # The simplest JSON that looks like a representation of the service root.
-SIMPLE_JSON = dumps({})
+SIMPLE_JSON = b'{}'
 
 
 class Response:
@@ -148,7 +148,7 @@
         """Show that bad WADL causes an exception."""
         self.assertRaises(
             SyntaxError, self.launchpad_with_responses,
-            Response(200, "This is not WADL."),
+            Response(200, b"This is not WADL."),
             Response(200, SIMPLE_JSON))
 
     def test_bad_json(self):
@@ -156,7 +156,7 @@
         self.assertRaises(
             JSONDecodeError, self.launchpad_with_responses,
             Response(200, SIMPLE_WADL),
-            Response(200, "This is not JSON."))
+            Response(200, b"This is not JSON."))
 
 
 class TestTokenFailureDuringRequest(SimulatedResponsesTestCase):
@@ -182,7 +182,7 @@
     def test_bad_token(self):
         """If our token is bad, we get another one."""
         SimulatedResponsesLaunchpad.responses = [
-            Response(401, "Invalid token."),
+            Response(401, b"Invalid token."),
             Response(200, SIMPLE_WADL),
             Response(200, SIMPLE_JSON)]
 
@@ -195,7 +195,7 @@
         """If our token is expired, we get another one."""
 
         SimulatedResponsesLaunchpad.responses = [
-            Response(401, "Expired token."),
+            Response(401, b"Expired token."),
             Response(200, SIMPLE_WADL),
             Response(200, SIMPLE_JSON)]
 
@@ -208,7 +208,7 @@
         """If our token is unknown, we get another one."""
 
         SimulatedResponsesLaunchpad.responses = [
-            Response(401, "Unknown access token."),
+            Response(401, b"Unknown access token."),
             Response(200, SIMPLE_WADL),
             Response(200, SIMPLE_JSON)]
 
@@ -221,7 +221,7 @@
         """We get another token no matter when the error happens."""
         SimulatedResponsesLaunchpad.responses = [
             Response(200, SIMPLE_WADL),
-            Response(401, "Expired token."),
+            Response(401, b"Expired token."),
             Response(200, SIMPLE_JSON)]
 
         self.assertEqual(self.engine.access_tokens_obtained, 0)
@@ -232,10 +232,10 @@
     def test_many_errors(self):
         """We'll keep getting new tokens as long as tokens are the problem."""
         SimulatedResponsesLaunchpad.responses = [
-            Response(401, "Invalid token."),
+            Response(401, b"Invalid token."),
             Response(200, SIMPLE_WADL),
-            Response(401, "Expired token."),
-            Response(401, "Invalid token."),
+            Response(401, b"Expired token."),
+            Response(401, b"Invalid token."),
             Response(200, SIMPLE_JSON)]
         self.assertEqual(self.engine.access_tokens_obtained, 0)
         launchpad = SimulatedResponsesLaunchpad.login_with(
@@ -246,7 +246,7 @@
         """If the token is not at fault, a 401 error raises an exception."""
 
         SimulatedResponsesLaunchpad.responses = [
-            Response(401, "Some other error.")]
+            Response(401, b"Some other error.")]
 
         self.assertRaises(
             Unauthorized, SimulatedResponsesLaunchpad.login_with,