small edits: suggestions from reviews

nibabel/tests/test_spaces.py

@@ -76,15 +76,7 @@ def get_outspace_params():
     )
 
 
-@pytest.mark.parametrize("arg_tuple", [
-    # Enforce number of axes
-    ((2, 3, 4, 5), np.eye(4)),
-    ((2, 3, 4, 5, 6), np.eye(4)),
-    # Voxel sizes must be positive
-    ((2, 3, 4), np.eye(4), [-1, 1, 1]),
-    ((2, 3, 4), np.eye(4), [1, 0, 1])
-])
-def test_vox2out_vox(arg_tuple):
+def test_vox2out_vox():
     # Test world space bounding box
     # Test basic case, identity, no voxel sizes passed
     shape, aff = vox2out_vox(((2, 3, 4), np.eye(4)))
@@ -101,7 +93,14 @@ def test_vox2out_vox(arg_tuple):
             assert isinstance(shape[0], int)
     # Enforce number of axes
     with pytest.raises(ValueError):
-        vox2out_vox(arg_tuple)
+        vox2out_vox(((2, 3, 4, 5), np.eye(4)))
+    with pytest.raises(ValueError):
+        vox2out_vox(((2, 3, 4, 5, 6), np.eye(4)))
+    # Voxel sizes must be positive
+    with pytest.raises(ValueError):
+        vox2out_vox(((2, 3, 4), np.eye(4), [-1, 1, 1]))
+    with pytest.raises(ValueError):
+        vox2out_vox(((2, 3, 4), np.eye(4), [1, 0, 1]))
 
 
 def test_slice2volume():
@@ -121,6 +120,6 @@ def test_slice2volume():
     [0, -1],
     [0, 3]
 ])
-def test_slice2volume_exception(args):
+def test_slice2volume_exception(index, axis):
     with pytest.raises(ValueError):
-        slice2volume(*args)
+        slice2volume(index, axis)

nibabel/tests/test_spatialimages.py

@@ -173,18 +173,15 @@ class CHeader(SpatialHeader):
         fobj = BytesIO()
         data = np.arange(6).reshape((1, 2, 3))
         hdr.data_to_fileobj(data, fobj)
-        assert (fobj.getvalue() ==
-                     data.astype(np.int32).tostring(order=order))
+        assert fobj.getvalue() == data.astype(np.int32).tostring(order=order)
         # data_to_fileobj accepts kwarg 'rescale', but no effect in this case
         fobj.seek(0)
         hdr.data_to_fileobj(data, fobj, rescale=True)
-        assert (fobj.getvalue() ==
-                     data.astype(np.int32).tostring(order=order))
+        assert fobj.getvalue() == data.astype(np.int32).tostring(order=order)
         # data_to_fileobj can be a list
         fobj.seek(0)
         hdr.data_to_fileobj(data.tolist(), fobj, rescale=True)
-        assert (fobj.getvalue() ==
-                     data.astype(np.int32).tostring(order=order))
+        assert fobj.getvalue() == data.astype(np.int32).tostring(order=order)
         # Read data back again
         fobj.seek(0)
         data2 = hdr.data_from_fileobj(fobj)
@@ -464,8 +461,8 @@ def test_slicer(self):
                         img.slicer[:, :, :, None]
                 else:
                     # Reorder non-spatial axes
-                    assert (img.slicer[:, :, :, None].shape ==
-                                 img.shape[:3] + (1,) + img.shape[3:])
+                    assert (img.slicer[:, :, :, None].shape
+                            == img.shape[:3] + (1,) + img.shape[3:])
                 # 4D to 3D using ellipsis or slices
                 assert img.slicer[..., 0].shape == img.shape[:-1]
                 assert img.slicer[:, :, :, 0].shape == img.shape[:-1]
@@ -480,8 +477,7 @@ def test_slicer(self):
                 with pytest.raises(ValueError):
                     img.slicer[:, :, :, :, None]
             else:
-                assert (img.slicer[:, :, :, :, None].shape ==
-                             img.shape + (1,))
+                assert img.slicer[:, :, :, :, None].shape == img.shape + (1,)
 
             # Crop by one voxel in each dimension
             sliced_i = img.slicer[1:]