More CodeQL corrections

Author: kevin-bates

tests/nbconvert/test_handlers.py

@@ -27,8 +27,8 @@
 @pytest.fixture
 def notebook(jp_root_dir):
     # Build sub directory.
+    subdir = jp_root_dir / 'foo'
     if not jp_root_dir.joinpath('foo').is_dir():
-        subdir = jp_root_dir / 'foo'
         subdir.mkdir()
 
     # Build a notebook programmatically.

tests/services/contents/test_api.py

@@ -100,7 +100,7 @@ async def test_get_dir_no_contents(jp_fetch, contents, path, name):
     assert model['path'] == path
     assert model['type'] == 'directory'
     assert 'content' in model
-    assert model['content'] == None
+    assert model['content'] is None
 
 
 async def test_list_nonexistant_dir(jp_fetch, contents):
@@ -144,7 +144,7 @@ async def test_get_nb_no_contents(jp_fetch, contents, path, name):
     assert model['path'] == nbpath
     assert model['type'] == 'notebook'
     assert 'content' in model
-    assert model['content'] == None
+    assert model['content'] is None
 
 
 async def test_get_nb_invalid(contents_dir, jp_fetch, contents):
@@ -623,7 +623,7 @@ async def test_checkpoints_follow_file(jp_fetch, contents):
     hcell = new_markdown_cell('Created by test')
     nb.cells.append(hcell)
     nbmodel = {'content': nb, 'type': 'notebook'}
-    r = await jp_fetch(
+    await jp_fetch(
         'api', 'contents', path, name,
         method='PUT',
         body=json.dumps(nbmodel)
@@ -653,7 +653,7 @@ async def test_rename_existing(jp_fetch, contents):
         name = 'a.ipynb'
         new_name = 'b.ipynb'
         # Rename the file
-        r = await jp_fetch(
+        await jp_fetch(
             'api', 'contents', path, name,
             method='PATCH',
             body=json.dumps({'path': path+'/'+new_name})
@@ -671,7 +671,7 @@ async def test_save(jp_fetch, contents):
     nb = from_dict(nbmodel)
     nb.cells.append(new_markdown_cell('Created by test ³'))
     nbmodel = {'content': nb, 'type': 'notebook'}
-    r = await jp_fetch(
+    await jp_fetch(
         'api', 'contents', 'foo/a.ipynb',
         method='PUT',
         body=json.dumps(nbmodel)
@@ -711,7 +711,7 @@ async def test_checkpoints(jp_fetch, contents):
 
     # Save it.
     nbmodel = {'content': nb, 'type': 'notebook'}
-    resp = await jp_fetch(
+    await jp_fetch(
         'api', 'contents', path,
         method='PUT',
         body=json.dumps(nbmodel)
@@ -790,7 +790,7 @@ async def test_file_checkpoints(jp_fetch, contents):
     }
 
     # Save it.
-    resp = await jp_fetch(
+    await jp_fetch(
         'api', 'contents', path,
         method='PUT',
         body=json.dumps(model)

tests/services/kernels/test_api.py

@@ -159,7 +159,7 @@ async def test_kernel_handler(jp_fetch):
     # Requests a bad kernel id.
     bad_id = '111-111-111-111-111'
     with pytest.raises(tornado.httpclient.HTTPClientError) as e:
-        r = await jp_fetch(
+        await jp_fetch(
             'api', 'kernels', bad_id,
             method='GET'
         )

tests/services/nbconvert/test_api.py

@@ -1,5 +1,6 @@
 import json
 
+
 async def test_list_formats(jp_fetch):
     r = await jp_fetch(
         'api', 'nbconvert',

tests/test_files.py

@@ -35,7 +35,7 @@ async def test_hidden_files(jp_fetch, jp_serverapp, jp_root_dir):
         assert r.body.decode() == 'foo'
 
         with pytest.raises(tornado.httpclient.HTTPClientError) as e:
-            r = await jp_fetch(
+            await jp_fetch(
                 'files', d, '.foo',
                 method='GET'
             )
@@ -44,7 +44,7 @@ async def test_hidden_files(jp_fetch, jp_serverapp, jp_root_dir):
     for d in hidden:
         for foo in ('foo', '.foo'):
             with pytest.raises(tornado.httpclient.HTTPClientError) as e:
-                r = await jp_fetch(
+                await jp_fetch(
                     'files', d, foo,
                     method='GET'
                 )
@@ -75,7 +75,7 @@ async def test_hidden_files(jp_fetch, jp_serverapp, jp_root_dir):
 
 
 async def test_contents_manager(jp_fetch, jp_serverapp, jp_root_dir):
-    "make sure ContentsManager returns right files (ipynb, bin, txt)."
+    """make sure ContentsManager returns right files (ipynb, bin, txt)."""
     nb = new_notebook(
         cells=[
             new_markdown_cell(u'Created by test ³'),
@@ -139,7 +139,6 @@ async def test_old_files_redirect(jp_fetch, jp_serverapp, jp_root_dir):
     jp_root_dir.joinpath('files').mkdir(parents=True, exist_ok=True)
     jp_root_dir.joinpath('sub', 'files').mkdir(parents=True, exist_ok=True)
 
-
     for prefix in ('', 'sub'):
         jp_root_dir.joinpath(prefix, 'files', 'f1.txt').write_text(prefix + '/files/f1')
         jp_root_dir.joinpath(prefix, 'files', 'f2.txt').write_text(prefix + '/files/f2')