heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

json.loads(request.body) => json.loads(response.body.decode()))

Browse Source 
This fixes python 3 stuff.

This commit sponsored by James Reilly.  Thanks, James!
This commit is contained in:
Christopher Allan Webber 2014-09-16 14:56:13 -05:00
parent fa3f46d714
commit 21cbf8294e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mediagoblin/tests/test_api.py
View File

@ -58,7 +58,7 @@ class TestAPI(object):
headers=headers headers=headers
) )
return response, json.loads(response.body) return response, json.loads(response.body.decode())
def _upload_image(self, test_app, image): def _upload_image(self, test_app, image):
""" Uploads and image to MediaGoblin via pump.io API """ """ Uploads and image to MediaGoblin via pump.io API """
@ -75,7 +75,7 @@ class TestAPI(object):
data, data,
headers=headers headers=headers
) )
image = json.loads(response.body) image = json.loads(response.body.decode())
return response, image return response, image
@ -227,7 +227,7 @@ class TestAPI(object):
headers={"Content-Type": "application/json"} 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 # Check everything has been set on the media correctly
media = MediaEntry.query.filter_by(id=image["id"]).first() 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) uri = "/api/user/{0}/profile".format(self.user.username)
with self.mock_oauth(): with self.mock_oauth():
response = test_app.get(uri) response = test_app.get(uri)
profile = json.loads(response.body) profile = json.loads(response.body.decode())
assert response.status_code == 200 assert response.status_code == 200
@ -420,7 +420,7 @@ class TestAPI(object):
uri = "/api/user/{0}/".format(self.user.username) uri = "/api/user/{0}/".format(self.user.username)
with self.mock_oauth(): with self.mock_oauth():
response = test_app.get(uri) response = test_app.get(uri)
user = json.loads(response.body) user = json.loads(response.body.decode())
assert response.status_code == 200 assert response.status_code == 200
@ -446,7 +446,7 @@ class TestAPI(object):
uri = "/api/user/{0}/feed".format(self.active_user.username) uri = "/api/user/{0}/feed".format(self.active_user.username)
with self.mock_oauth(): with self.mock_oauth():
response = test_app.get(uri) response = test_app.get(uri)
feed = json.loads(response.body) feed = json.loads(response.body.decode())
assert response.status_code == 200 assert response.status_code == 200
@ -481,7 +481,7 @@ class TestAPI(object):
with self.mock_oauth(): with self.mock_oauth():
response = test_app.get(data["object"]["links"]["self"]["href"]) 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 assert response.status_code == 200

2
mediagoblin/tests/test_legacy_api.py
View File

@ -78,7 +78,7 @@ class TestAPI(object):
'/api/test', '/api/test',
headers=self.http_auth_headers()) headers=self.http_auth_headers())
assert json.loads(response.body) == { assert json.loads(response.body.decode()) == {
"username": "joapi", "email": "joapi@example.com"} "username": "joapi", "email": "joapi@example.com"}
def test_2_test_submission(self, test_app): def test_2_test_submission(self, test_app):