aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/test_api.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2014-09-16 14:56:13 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2014-09-16 14:56:13 -0500
commit21cbf8294eba59b29d56f30ce32b0cc1f9587981 (patch)
tree2c69229d522f4292d84c2b7d9f88f90e1c536c12 /mediagoblin/tests/test_api.py
parentfa3f46d7144629eed6f1f6f9abc884a1b8f4c330 (diff)
downloadmediagoblin-21cbf8294eba59b29d56f30ce32b0cc1f9587981.tar.lz
mediagoblin-21cbf8294eba59b29d56f30ce32b0cc1f9587981.tar.xz
mediagoblin-21cbf8294eba59b29d56f30ce32b0cc1f9587981.zip
json.loads(request.body) => json.loads(response.body.decode()))
This fixes python 3 stuff. This commit sponsored by James Reilly. Thanks, James!
Diffstat (limited to 'mediagoblin/tests/test_api.py')
-rw-r--r--mediagoblin/tests/test_api.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/mediagoblin/tests/test_api.py b/mediagoblin/tests/test_api.py
index 31bf50b3..3ac21366 100644
--- a/mediagoblin/tests/test_api.py
+++ b/mediagoblin/tests/test_api.py
@@ -58,7 +58,7 @@ class TestAPI(object):
headers=headers
)
- return response, json.loads(response.body)
+ return response, json.loads(response.body.decode())
def _upload_image(self, test_app, image):
""" Uploads and image to MediaGoblin via pump.io API """
@@ -75,7 +75,7 @@ class TestAPI(object):
data,
headers=headers
)
- image = json.loads(response.body)
+ image = json.loads(response.body.decode())
return response, image
@@ -227,7 +227,7 @@ class TestAPI(object):
headers={"Content-Type": "application/json"}
)
- image = json.loads(response.body)["object"]
+ image = json.loads(response.body.decode())["object"]
# Check everything has been set on the media correctly
media = MediaEntry.query.filter_by(id=image["id"]).first()
@@ -406,7 +406,7 @@ class TestAPI(object):
uri = "/api/user/{0}/profile".format(self.user.username)
with self.mock_oauth():
response = test_app.get(uri)
- profile = json.loads(response.body)
+ profile = json.loads(response.body.decode())
assert response.status_code == 200
@@ -420,7 +420,7 @@ class TestAPI(object):
uri = "/api/user/{0}/".format(self.user.username)
with self.mock_oauth():
response = test_app.get(uri)
- user = json.loads(response.body)
+ user = json.loads(response.body.decode())
assert response.status_code == 200
@@ -446,7 +446,7 @@ class TestAPI(object):
uri = "/api/user/{0}/feed".format(self.active_user.username)
with self.mock_oauth():
response = test_app.get(uri)
- feed = json.loads(response.body)
+ feed = json.loads(response.body.decode())
assert response.status_code == 200
@@ -481,7 +481,7 @@ class TestAPI(object):
with self.mock_oauth():
response = test_app.get(data["object"]["links"]["self"]["href"])
- data = json.loads(response.body)
+ data = json.loads(response.body.decode())
assert response.status_code == 200