STY: Reduce array().astype() and similar constructs

[git-blame-ignore-rev]

Author: effigies

Diff for: nibabel/freesurfer/io.py

@@ -70,9 +70,9 @@ def _read_volume_info(fobj):
         if key in ('valid', 'filename'):
             volume_info[key] = pair[1].strip()
         elif key == 'volume':
-            volume_info[key] = np.array(pair[1].split()).astype(int)
+            volume_info[key] = np.array(pair[1].split(), int)
         else:
-            volume_info[key] = np.array(pair[1].split()).astype(float)
+            volume_info[key] = np.array(pair[1].split(), float)
     # Ignore the rest
     return volume_info
 
@@ -521,7 +521,7 @@ def write_annot(filepath, labels, ctab, names, fill_ctab=True):
         vnum = len(labels)
 
         def write(num, dtype=dt):
-            np.array([num]).astype(dtype).tofile(fobj)
+            np.array([num], dtype).tofile(fobj)
 
         def write_string(s):
             s = (s if isinstance(s, bytes) else s.encode()) + b'\x00'

Diff for: nibabel/freesurfer/tests/test_mghformat.py

@@ -123,7 +123,7 @@ def test_write_mgh():
 def test_write_noaffine_mgh():
     # now just save the image without the vox2ras transform
     # and see if it uses the default values to save
-    v = np.ones((7, 13, 3, 22)).astype(np.uint8)
+    v = np.ones((7, 13, 3, 22), np.uint8)
     # form a MGHImage object using data
     # and the default affine matrix (Note the "None")
     img = MGHImage(v, None)
@@ -175,7 +175,7 @@ def bad_dtype_mgh():
     """
     # try to write an unsigned short and make sure it
     # raises MGHError
-    v = np.ones((7, 13, 3, 22)).astype(np.uint16)
+    v = np.ones((7, 13, 3, 22), np.uint16)
     # form a MGHImage object using data
     # and the default affine matrix (Note the "None")
     MGHImage(v, None)
@@ -189,7 +189,7 @@ def test_bad_dtype_mgh():
 
 def test_filename_exts():
     # Test acceptable filename extensions
-    v = np.ones((7, 13, 3, 22)).astype(np.uint8)
+    v = np.ones((7, 13, 3, 22), np.uint8)
     # form a MGHImage object using data
     # and the default affine matrix (Note the "None")
     img = MGHImage(v, None)
@@ -251,7 +251,7 @@ def test_header_updating():
 
 def test_cosine_order():
     # Test we are interpreting the cosine order right
-    data = np.arange(60).reshape((3, 4, 5)).astype(np.int32)
+    data = np.arange(60, dtype=np.int32).reshape((3, 4, 5))
     aff = np.diag([2.0, 3, 4, 1])
     aff[0] = [2, 1, 0, 10]
     img = MGHImage(data, aff)

Diff for: nibabel/gifti/tests/test_gifti.py

@@ -465,7 +465,7 @@ def test_darray_dtype_coercion_failures():
     encodings = ('ASCII', 'B64BIN', 'B64GZ')
     for data_dtype, darray_dtype, encoding in itertools.product(dtypes, dtypes, encodings):
         da = GiftiDataArray(
-            np.arange(10).astype(data_dtype),
+            np.arange(10, dtype=data_dtype),
             encoding=encoding,
             intent='NIFTI_INTENT_NODE_INDEX',
             datatype=darray_dtype,

Diff for: nibabel/tests/test_funcs.py

@@ -127,7 +127,7 @@ def test_concat():
 
 def test_closest_canonical():
     # Use 32-bit data so that the AnalyzeImage class doesn't complain
-    arr = np.arange(24).reshape((2, 3, 4, 1)).astype(np.int32)
+    arr = np.arange(24, dtype=np.int32).reshape((2, 3, 4, 1))
 
     # Test with an AnalyzeImage first
     img = AnalyzeImage(arr, np.eye(4))

Diff for: nibabel/tests/test_image_api.py

@@ -255,7 +255,7 @@ def validate_data_interface(self, imaker, params):
             with maybe_deprecated(meth_name), pytest.raises(ValueError):
                 method(caching='something')
         # dataobj is read only
-        fake_data = np.zeros(img.shape).astype(img.get_data_dtype())
+        fake_data = np.zeros(img.shape, dtype=img.get_data_dtype())
         with pytest.raises(AttributeError):
             img.dataobj = fake_data
         # So is in_memory

Diff for: nibabel/tests/test_proxy_api.py

@@ -61,7 +61,7 @@
 
 def _some_slicers(shape):
     ndim = len(shape)
-    slicers = np.eye(ndim).astype(int).astype(object)
+    slicers = np.eye(ndim, dtype=int).astype(object)
     slicers[slicers == 0] = slice(None)
     for i in range(ndim):
         if i % 2:

Diff for: nibabel/tests/test_volumeutils.py

@@ -1141,7 +1141,7 @@ def assert_rt(
     for in_cast, pre_clips, inter, slope, post_clips, nan_fill in itp(
         (None, np.float32), (None, (-1, 25)), (0.0, 1.0), (1.0, 0.5), (None, (-2, 49)), (None, 1)
     ):
-        data = np.arange(24).astype(np.float32)
+        data = np.arange(24, dtype=np.float32)
         assert_rt(
             data,
             shape,