Merge branch 'merge-python3-port'

Conflicts:
	setup.py

1 files changed, 6 insertions, 5 deletions

diff --git a/mediagoblin/tests/test_legacy_api.py b/mediagoblin/tests/test_legacy_api.py
index 4e0cbd8f..b3b2fcec 100644
--- a/mediagoblin/tests/test_legacy_api.py
+++ b/mediagoblin/tests/test_legacy_api.py
@@ -17,6 +17,7 @@
 
 import logging
 import base64
+import json
 
 import pytest
 
@@ -48,10 +49,10 @@ class TestAPI(object):
         return template.TEMPLATE_TEST_CONTEXT[template_name]
 
     def http_auth_headers(self):
-        return {'Authorization': 'Basic {0}'.format(
-                base64.b64encode(':'.join([
+        return {'Authorization': ('Basic {0}'.format(
+                base64.b64encode((':'.join([
                     self.user.username,
-                    self.user_password])))}
+                    self.user_password])).encode('ascii')).decode()))}
 
     def do_post(self, data, test_app, **kwargs):
         url = kwargs.pop('url', '/api/submit')
@@ -77,8 +78,8 @@ class TestAPI(object):
             '/api/test',
             headers=self.http_auth_headers())
 
-        assert response.body == \
-                '{"username": "joapi", "email": "joapi@example.com"}'
+        assert json.loads(response.body.decode()) == {
+            "username": "joapi", "email": "joapi@example.com"}
 
     def test_2_test_submission(self, test_app):
         self.login(test_app)