TEST: Style and parameterization fixes for readability

effigies · effigies · commit 7392e8fadf57 · 2020-02-19T23:30:28.000-05:00
diff --git a/nibabel/cifti2/tests/test_cifti2io_header.py b/nibabel/cifti2/tests/test_cifti2io_header.py
@@ -255,7 +255,7 @@ def test_read_geometry():
                        [ 0, 0, 0,    1]]
     expected_dimensions = (91, 109, 91)
     assert (geometry_mapping.volume.transformation_matrix_voxel_indices_ijk_to_xyz.matrix ==
-                 expected_affine).all()
+            expected_affine).all()
     assert geometry_mapping.volume.volume_dimensions == expected_dimensions
 
 
diff --git a/nibabel/tests/test_arraywriters.py b/nibabel/tests/test_arraywriters.py
@@ -610,12 +610,12 @@ def test_dumber_writers():
     aw.slope = 2.0
     assert aw.slope == 2.0
     with pytest.raises(AttributeError):
-        getattr(aw, 'inter')
+        aw.inter
     aw = ArrayWriter(arr)
     with pytest.raises(AttributeError):
-        getattr(aw, 'slope')
+        aw.slope
     with pytest.raises(AttributeError):
-        getattr(aw, 'inter')
+        aw.inter
     # Attempt at scaling should raise error for dumb type
     with pytest.raises(WriterError):
         ArrayWriter(arr, np.int16)
diff --git a/nibabel/tests/test_files_interface.py b/nibabel/tests/test_files_interface.py
@@ -57,7 +57,7 @@ def test_files_interface():
     assert img.get_filename() == 'test.nii'
     assert img.file_map['image'].filename == 'test.nii'
     with pytest.raises(KeyError):
-        img.file_map.__getitem__('header')
+        img.file_map['header']
     # pair - note new class
     img = Nifti1Pair(arr, aff)
     img.set_filename('test')
diff --git a/nibabel/tests/test_image_load_save.py b/nibabel/tests/test_image_load_save.py
@@ -137,8 +137,7 @@ def test_save_load():
             del re_img2
             spm99.save(img, sifn)
             re_img3 = nils.load(sifn)
-            assert isinstance(re_img3,
-                                   spm99.Spm99AnalyzeImage)
+            assert isinstance(re_img3, spm99.Spm99AnalyzeImage)
             assert_array_equal(re_img3.get_fdata(), data)
             assert_array_equal(re_img3.affine, affine)
             ni1.save(re_img3, nifn)
@@ -301,30 +300,14 @@ def wat(hdr):
 
 def test_guessed_image_type():
     # Test whether we can guess the image type from example files
-    assert (nils.guessed_image_type(
-        pjoin(DATA_PATH, 'example4d.nii.gz')) ==
-        Nifti1Image)
-    assert (nils.guessed_image_type(
-        pjoin(DATA_PATH, 'nifti1.hdr')) ==
-        Nifti1Pair)
-    assert (nils.guessed_image_type(
-        pjoin(DATA_PATH, 'example_nifti2.nii.gz')) ==
-        Nifti2Image)
-    assert (nils.guessed_image_type(
-        pjoin(DATA_PATH, 'nifti2.hdr')) ==
-        Nifti2Pair)
-    assert (nils.guessed_image_type(
-        pjoin(DATA_PATH, 'tiny.mnc')) ==
-        Minc1Image)
-    assert (nils.guessed_image_type(
-        pjoin(DATA_PATH, 'small.mnc')) ==
-        Minc2Image)
-    assert (nils.guessed_image_type(
-        pjoin(DATA_PATH, 'test.mgz')) ==
-        MGHImage)
-    assert (nils.guessed_image_type(
-        pjoin(DATA_PATH, 'analyze.hdr')) ==
-        Spm2AnalyzeImage)
+    assert nils.guessed_image_type(pjoin(DATA_PATH, 'example4d.nii.gz')) == Nifti1Image
+    assert nils.guessed_image_type(pjoin(DATA_PATH, 'nifti1.hdr')) == Nifti1Pair
+    assert nils.guessed_image_type(pjoin(DATA_PATH, 'example_nifti2.nii.gz')) == Nifti2Image
+    assert nils.guessed_image_type(pjoin(DATA_PATH, 'nifti2.hdr')) == Nifti2Pair
+    assert nils.guessed_image_type(pjoin(DATA_PATH, 'tiny.mnc')) == Minc1Image
+    assert nils.guessed_image_type(pjoin(DATA_PATH, 'small.mnc')) == Minc2Image
+    assert nils.guessed_image_type(pjoin(DATA_PATH, 'test.mgz')) == MGHImage
+    assert nils.guessed_image_type(pjoin(DATA_PATH, 'analyze.hdr')) == Spm2AnalyzeImage
 
 
 def test_fail_save():
diff --git a/nibabel/tests/test_nifti1.py b/nibabel/tests/test_nifti1.py
diff --git a/nibabel/tests/test_nifti2.py b/nibabel/tests/test_nifti2.py
@@ -49,16 +49,14 @@ def test_eol_check(self):
         hdr['eol_check'] = 0
         fhdr, message, raiser = self.log_chk(hdr, 20)
         assert_array_equal(fhdr['eol_check'], good_eol)
-        assert (message ==
-                     'EOL check all 0; '
-                     'setting EOL check to 13, 10, 26, 10')
+        assert message == 'EOL check all 0; setting EOL check to 13, 10, 26, 10'
         hdr['eol_check'] = (13, 10, 0, 10)
         fhdr, message, raiser = self.log_chk(hdr, 40)
         assert_array_equal(fhdr['eol_check'], good_eol)
         assert (message ==
-                     'EOL check not 0 or 13, 10, 26, 10; '
-                     'data may be corrupted by EOL conversion; '
-                     'setting EOL check to 13, 10, 26, 10')
+                'EOL check not 0 or 13, 10, 26, 10; '
+                'data may be corrupted by EOL conversion; '
+                'setting EOL check to 13, 10, 26, 10')
 
 
 class TestNifti2PairHeader(_Nifti2Mixin, TestNifti1PairHeader):
diff --git a/nibabel/tests/test_optpkg.py b/nibabel/tests/test_optpkg.py
@@ -26,7 +26,7 @@ def assert_bad(pkg_name, min_version=None):
     assert not have_pkg
     assert isinstance(pkg, TripWire)
     with pytest.raises(TripWireError):
-        getattr(pkg, 'a_method')
+        pkg.a_method
     with pytest.raises(SkipTest):
         setup()
 
@@ -77,7 +77,6 @@ def test_versions():
         try:
             pkg.some_method
         except TripWireError as err:
-            assert (str(err) ==
-                         'These functions need _a_fake_package version >= 3.0')
+            assert str(err) == 'These functions need _a_fake_package version >= 3.0'
     finally:
         del sys.modules[fake_name]
diff --git a/nibabel/tests/test_orientations.py b/nibabel/tests/test_orientations.py
@@ -267,25 +267,25 @@ def test_ornt2axcodes():
     # Recoding orientation to axis codes
     labels = (('left', 'right'), ('back', 'front'), ('down', 'up'))
     assert ornt2axcodes([[0, 1],
-                               [1, 1],
-                               [2, 1]], labels) == ('right', 'front', 'up')
+                         [1, 1],
+                         [2, 1]], labels) == ('right', 'front', 'up')
     assert ornt2axcodes([[0, -1],
-                               [1, -1],
-                               [2, -1]], labels) == ('left', 'back', 'down')
+                         [1, -1],
+                         [2, -1]], labels) == ('left', 'back', 'down')
     assert ornt2axcodes([[2, -1],
-                               [1, -1],
-                               [0, -1]], labels) == ('down', 'back', 'left')
+                         [1, -1],
+                         [0, -1]], labels) == ('down', 'back', 'left')
     assert ornt2axcodes([[1, 1],
-                               [2, -1],
-                               [0, 1]], labels) == ('front', 'down', 'right')
+                         [2, -1],
+                         [0, 1]], labels) == ('front', 'down', 'right')
     # default is RAS output directions
     assert ornt2axcodes([[0, 1],
-                               [1, 1],
-                               [2, 1]]) == ('R', 'A', 'S')
+                         [1, 1],
+                         [2, 1]]) == ('R', 'A', 'S')
     # dropped axes produce None
     assert ornt2axcodes([[0, 1],
-                               [np.nan, np.nan],
-                               [2, 1]]) == ('R', None, 'S')
+                         [np.nan, np.nan],
+                         [2, 1]]) == ('R', None, 'S')
     # Non integer axes raises error
     with pytest.raises(ValueError):
         ornt2axcodes([[0.1, 1]])
@@ -365,10 +365,8 @@ def test_axcodes2ornt():
 def test_aff2axcodes():
     assert aff2axcodes(np.eye(4)) == tuple('RAS')
     aff = [[0, 1, 0, 10], [-1, 0, 0, 20], [0, 0, 1, 30], [0, 0, 0, 1]]
-    assert (aff2axcodes(aff, (('L', 'R'), ('B', 'F'), ('D', 'U'))) ==
-                 ('B', 'R', 'U'))
-    assert (aff2axcodes(aff, (('L', 'R'), ('B', 'F'), ('D', 'U'))) ==
-                 ('B', 'R', 'U'))
+    assert aff2axcodes(aff, (('L', 'R'), ('B', 'F'), ('D', 'U'))) == ('B', 'R', 'U')
+    assert aff2axcodes(aff, (('L', 'R'), ('B', 'F'), ('D', 'U'))) == ('B', 'R', 'U')
 
 
 def test_inv_ornt_aff():
diff --git a/nibabel/tests/test_parrec.py b/nibabel/tests/test_parrec.py
@@ -345,8 +345,7 @@ def test_sorting_multiple_echos_and_contrasts():
                            np.arange(1, nslices+1))
         current_echo = slice_offset % nechos + 1
         # same echo for each slice in the group
-        assert (np.all(sorted_echos[istart:iend] == current_echo) ==
-                     True)
+        assert np.all(sorted_echos[istart:iend] == current_echo)
     # outermost sort index is image_type_mr
     assert np.all(sorted_types[:ntotal//4] == 0)
     assert np.all(sorted_types[ntotal//4:ntotal//2] == 1)
@@ -403,8 +402,7 @@ def test_sorting_multiecho_ASL():
 
     # check volume labels
     vol_labels = asl_hdr.get_volume_labels()
-    assert (list(vol_labels.keys()) ==
-                 ['echo number', 'label type', 'dynamic scan number'])
+    assert list(vol_labels.keys()) == ['echo number', 'label type', 'dynamic scan number']
     assert_array_equal(vol_labels['dynamic scan number'], [1]*6 + [2]*6)
     assert_array_equal(vol_labels['label type'], [1]*3 + [2]*3 + [1]*3 + [2]*3)
     assert_array_equal(vol_labels['echo number'], [1, 2, 3]*4)
diff --git a/nibabel/tests/test_processing.py b/nibabel/tests/test_processing.py
@@ -287,17 +287,11 @@ def test_resample_to_output():
     img_ni1 = Nifti2Image(data, np.eye(4))
     img_ni2 = Nifti2Image(data, np.eye(4))
     # Default is Nifti1Image
-    assert (
-        resample_to_output(img_ni2).__class__ ==
-        Nifti1Image)
+    assert resample_to_output(img_ni2).__class__ == Nifti1Image
     # Can be overriden
-    assert (
-        resample_to_output(img_ni1, out_class=Nifti2Image).__class__ ==
-        Nifti2Image)
+    assert resample_to_output(img_ni1, out_class=Nifti2Image).__class__ == Nifti2Image
     # None specifies out_class from input
-    assert (
-        resample_to_output(img_ni2, out_class=None).__class__ ==
-        Nifti2Image)
+    assert resample_to_output(img_ni2, out_class=None).__class__ == Nifti2Image
 
 
 @needs_scipy
@@ -347,17 +341,11 @@ def test_smooth_image():
     img_ni1 = Nifti2Image(data, np.eye(4))
     img_ni2 = Nifti2Image(data, np.eye(4))
     # Default is Nifti1Image
-    assert (
-        smooth_image(img_ni2, 0).__class__ ==
-        Nifti1Image)
+    assert smooth_image(img_ni2, 0).__class__ == Nifti1Image
     # Can be overriden
-    assert (
-        smooth_image(img_ni1, 0, out_class=Nifti2Image).__class__ ==
-        Nifti2Image)
+    assert smooth_image(img_ni1, 0, out_class=Nifti2Image).__class__ == Nifti2Image
     # None specifies out_class from input
-    assert (
-        smooth_image(img_ni2, 0, out_class=None).__class__ ==
-        Nifti2Image)
+    assert smooth_image(img_ni2, 0, out_class=None).__class__ == Nifti2Image
 
 
 @needs_scipy
diff --git a/nibabel/tests/test_proxy_api.py b/nibabel/tests/test_proxy_api.py
@@ -104,15 +104,15 @@ def validate_shape(self, pmaker, params):
         assert_array_equal(prox.shape, params['shape'])
         # Read only
         with pytest.raises(AttributeError):
-            setattr(prox, 'shape', params['shape'])
+            prox.shape = params['shape']
 
     def validate_ndim(self, pmaker, params):
         # Check shape
         prox, fio, hdr = pmaker()
         assert prox.ndim == len(params['shape'])
         # Read only
         with pytest.raises(AttributeError):
-            setattr(prox, 'ndim', len(params['shape']))
+            prox.ndim = len(params['shape'])
 
     def validate_is_proxy(self, pmaker, params):
         # Check shape
@@ -122,7 +122,7 @@ def validate_is_proxy(self, pmaker, params):
         assert not is_proxy(np.arange(10))
         # Read only
         with pytest.raises(AttributeError):
-            setattr(prox, 'is_proxy', False)
+            prox.is_proxy = False
 
     def validate_asarray(self, pmaker, params):
         # Check proxy returns expected array from asarray
@@ -311,7 +311,7 @@ def validate_dtype(self, pmaker, params):
         prox, fio, hdr = pmaker()
         assert_dt_equal(prox.dtype, params['dtype'])
         with pytest.raises(AttributeError):
-            prox.__setattr__('dtype', np.dtype(prox.dtype))
+            prox.dtype = np.dtype(prox.dtype)
 
     def validate_slope_inter_offset(self, pmaker, params):
         # Check slope, inter, offset
diff --git a/nibabel/tests/test_scaling.py b/nibabel/tests/test_scaling.py
@@ -131,26 +131,22 @@ def test_a2f_nan2zero():
     assert_array_equal(data_back, [np.array(np.nan).astype(np.int32), 99])
 
 
-@pytest.mark.parametrize("in_type, out_type, err", [
-    (np.int16, np.int16, None),
-    (np.int16, np.int8, None),
-    (np.uint16, np.uint8, None),
-    (np.int32, np.int8, None),
-    (np.float32, np.uint8, None),
-    (np.float32, np.int16, None)
+@pytest.mark.parametrize("in_type, out_type", [
+    (np.int16, np.int16),
+    (np.int16, np.int8),
+    (np.uint16, np.uint8),
+    (np.int32, np.int8),
+    (np.float32, np.uint8),
+    (np.float32, np.int16)
 ])
-def test_array_file_scales(in_type, out_type, err):
+def test_array_file_scales(in_type, out_type):
     # Test scaling works for max, min when going from larger to smaller type,
     # and from float to integer.
     bio = BytesIO()
     out_dtype = np.dtype(out_type)
     arr = np.zeros((3,), dtype=in_type)
     info = type_info(in_type)
     arr[0], arr[1] = info['min'], info['max']
-    if not err is None:
-        with pytest.raises(err):
-            _calculate_scale(arr, out_dtype, True)
-        return
     slope, inter, mn, mx = _calculate_scale(arr, out_dtype, True)
     array_to_file(arr, bio, out_type, 0, inter, slope, mn, mx)
     bio.seek(0)
@@ -225,5 +221,4 @@ def check_int_a2f(in_type, out_type):
     # Clip at extremes to remove inf
     info = type_info(in_type)
     out_min, out_max = info['min'], info['max']
-    assert np.allclose(big_floater(data),
-                            big_floater(np.clip(data_back, out_min, out_max)))
+    assert np.allclose(big_floater(data), big_floater(np.clip(data_back, out_min, out_max)))
diff --git a/nibabel/tests/test_scripts.py b/nibabel/tests/test_scripts.py
@@ -412,8 +412,7 @@ def test_parrec2nii_with_data():
             for line in csvreader:
                 nlines += 1
 
-        assert sorted(csv_keys) == ['diffusion b value number',
-                                        'gradient orientation number']
+        assert sorted(csv_keys) == ['diffusion b value number', 'gradient orientation number']
         assert nlines == 8  # 8 volumes present in DTI.PAR
 
 
diff --git a/nibabel/tests/test_spatialimages.py b/nibabel/tests/test_spatialimages.py
@@ -435,8 +435,7 @@ def test_slicer(self):
             sliceobj = [slice(None, None, 2)] * 3 + \
                 [slice(None)] * (len(dshape) - 3)
             downsampled_img = img.slicer[tuple(sliceobj)]
-            assert (downsampled_img.header.get_zooms()[:3]
-                    == np.array(spatial_zooms) * 2).all()
+            assert (downsampled_img.header.get_zooms()[:3] == np.array(spatial_zooms) * 2).all()
 
             max4d = (hasattr(img.header, '_structarr') and
                      'dims' in img.header._structarr.dtype.fields and
diff --git a/nibabel/tests/test_testing.py b/nibabel/tests/test_testing.py
@@ -165,9 +165,8 @@ def test_assert_re_in_exception(args):
 
 def test_test_data():
     assert test_data() == data_path
-    assert (test_data() ==
-                 os.path.abspath(os.path.join(os.path.dirname(__file__),
-                                              '..', 'tests', 'data')))
+    assert test_data() == os.path.abspath(os.path.join(os.path.dirname(__file__),
+                                                       '..', 'tests', 'data'))
     for subdir in ('nicom', 'gifti', 'externals'):
         assert test_data(subdir) == os.path.join(data_path[:-10], subdir, 'tests', 'data')
         assert os.path.exists(test_data(subdir))
diff --git a/nibabel/tests/test_tripwire.py b/nibabel/tests/test_tripwire.py
@@ -14,7 +14,7 @@ def test_tripwire():
     # Test tripwire object
     silly_module_name = TripWire('We do not have silly_module_name')
     with pytest.raises(TripWireError):
-        getattr(silly_module_name, 'do_silly_thing')
+        silly_module_name.do_silly_thing
     # Check AttributeError can be checked too
     try:
         silly_module_name.__wrapped__
diff --git a/nibabel/tests/test_wrapstruct.py b/nibabel/tests/test_wrapstruct.py
