decode json models on 3.5

Author: Zsailer

.travis.yml

@@ -37,7 +37,7 @@ script:
       else
           true
       fi
-    - 'if [[ $GROUP == python ]]; then pytest jupyter_server; fi'
+    - 'if [[ $GROUP == python ]]; then pytest; fi'
     - |
       if [[ $GROUP == docs ]]; then
         EXIT_STATUS=0

appveyor.yml

@@ -25,4 +25,4 @@ install:
   - cmd: pip install .[test]
 
 test_script:
-  - pytest jupyter_server
+  - pytest

tests/conftest.py

@@ -42,7 +42,7 @@ def expected_http_error(error, expected_code, expected_message=None):
         if expected_code != e.code:
             return False
         if expected_message:
-            message = json.loads(e.response.body)['message']
+            message = json.loads(e.response.body.decode())['message']
             if expected_message != message:
                 return False
         return True
@@ -72,10 +72,10 @@ def environ(
     monkeypatch.setenv('JUPYTER_CONFIG_DIR', str(config_dir))
     monkeypatch.setenv('JUPYTER_DATA_DIR', str(data_dir))
     monkeypatch.setenv('JUPYTER_RUNTIME_DIR', str(runtime_dir))
-    monkeypatch.setattr(jupyter_core.paths, 'SYSTEM_JUPYTER_PATH', [mkdir(tmp_path, 'share', 'jupyter')])
-    monkeypatch.setattr(jupyter_core.paths, 'ENV_JUPYTER_PATH', [mkdir(tmp_path, 'env', 'share', 'jupyter')])
-    monkeypatch.setattr(jupyter_core.paths, 'SYSTEM_CONFIG_PATH', [mkdir(tmp_path, 'etc', 'jupyter')])
-    monkeypatch.setattr(jupyter_core.paths, 'ENV_CONFIG_PATH', [mkdir(tmp_path, 'env', 'etc', 'jupyter')])
+    monkeypatch.setattr(jupyter_core.paths, 'SYSTEM_JUPYTER_PATH', [str(mkdir(tmp_path, 'share', 'jupyter'))])
+    monkeypatch.setattr(jupyter_core.paths, 'ENV_JUPYTER_PATH', [str(mkdir(tmp_path, 'env', 'share', 'jupyter'))])
+    monkeypatch.setattr(jupyter_core.paths, 'SYSTEM_CONFIG_PATH', [str(mkdir(tmp_path, 'etc', 'jupyter'))])
+    monkeypatch.setattr(jupyter_core.paths, 'ENV_CONFIG_PATH', [str(mkdir(tmp_path, 'env', 'etc', 'jupyter'))])
 
 
 @pytest.fixture

tests/nbconvert/test_handlers.py

@@ -114,7 +114,7 @@ async def test_from_post(fetch, notebook):
         'api/contents/foo/testnb.ipynb',
         method='GET',
     )
-    nbmodel = json.loads(r.body)
+    nbmodel = json.loads(r.body.decode())
 
     r = await fetch(
         'nbconvert', 'html',
@@ -142,7 +142,7 @@ async def test_from_post_zip(fetch, notebook):
         'api/contents/foo/testnb.ipynb',
         method='GET',
     )
-    nbmodel = json.loads(r.body)
+    nbmodel = json.loads(r.body.decode())
 
     r = await fetch(
         'nbconvert', 'latex',

tests/services/config/test_api.py

@@ -18,7 +18,7 @@ async def test_create_retrieve_config(fetch):
         method='GET',
     )
     assert response2.code == 200
-    assert json.loads(response2.body) == sample
+    assert json.loads(response2.body.decode()) == sample
 
 
 async def test_modify(fetch):
@@ -56,7 +56,7 @@ async def test_modify(fetch):
     )
 
     assert response2.code == 200
-    assert json.loads(response2.body) == diff
+    assert json.loads(response2.body.decode()) == diff
 
 
 async def test_get_unknown(fetch):
@@ -65,4 +65,4 @@ async def test_get_unknown(fetch):
         method='GET',
     )
     assert response.code == 200
-    assert json.loads(response.body) == {}
+    assert json.loads(response.body.decode()) == {}