Merge remote-tracking branch 'origin/next'0.3.0b

1 files changed, 3 insertions, 3 deletions

diff --git a/pecan/tests/test_jsonify.py b/pecan/tests/test_jsonify.py
index 1c1c589..2dcd663 100644
--- a/pecan/tests/test_jsonify.py
+++ b/pecan/tests/test_jsonify.py
@@ -72,7 +72,7 @@ class TestJsonify(PecanTestCase):
 
         r = app.get('/')
         assert r.status_int == 200
-        assert loads(r.body) == {'name': 'Jonathan LaCour'}
+        assert loads(r.body.decode()) == {'name': 'Jonathan LaCour'}
 
 
 class TestJsonifyGenericEncoder(PecanTestCase):
@@ -203,8 +203,8 @@ class TestJsonifySQLAlchemyGenericEncoder(PecanTestCase):
 
         # add some dummy data
         user_table.insert().execute([
-            {'first_name': u'Jonathan', 'last_name': u'LaCour'},
-            {'first_name': u'Yoann', 'last_name': u'Roman'}
+            {'first_name': 'Jonathan', 'last_name': 'LaCour'},
+            {'first_name': 'Yoann', 'last_name': 'Roman'}
         ])
 
         # get the SA objects