STY: Refactor string formatting linter

Author: acsenrafilho

asltk/utils.py

@@ -138,10 +138,12 @@ def load_image(
     return sitk.GetArrayFromImage(img)
 
 
-def _make_bids_path(bids_root, subject, session=None, suffix='asl', extension='.nii.gz'):
-    subj_dir = f"sub-{subject}"
-    ses_dir = f"ses-{session}" if session else None
-    modality_dir = "asl"
+def _make_bids_path(
+    bids_root, subject, session=None, suffix='asl', extension='.nii.gz'
+):
+    subj_dir = f'sub-{subject}'
+    ses_dir = f'ses-{session}' if session else None
+    modality_dir = 'asl'
 
     if ses_dir:
         out_dir = os.path.join(bids_root, subj_dir, ses_dir, modality_dir)
@@ -150,15 +152,22 @@ def _make_bids_path(bids_root, subject, session=None, suffix='asl', extension='.
 
     os.makedirs(out_dir, exist_ok=True)
 
-    filename = f"sub-{subject}"
+    filename = f'sub-{subject}'
     if session:
-        filename += f"_ses-{session}"
-    filename += f"_{suffix}{extension}"
+        filename += f'_ses-{session}'
+    filename += f'_{suffix}{extension}'
 
     return os.path.join(out_dir, filename)
 
 
-def save_image(img: np.ndarray, full_path: str = None, *, bids_root: str = None, subject: str = None, session: str = None):
+def save_image(
+    img: np.ndarray,
+    full_path: str = None,
+    *,
+    bids_root: str = None,
+    subject: str = None,
+    session: str = None,
+):
     """Save image to a file path.
 
     All the available image formats provided in the SimpleITK API can be
@@ -174,13 +183,22 @@ def save_image(img: np.ndarray, full_path: str = None, *, bids_root: str = None,
         full_path = _make_bids_path(bids_root, subject, session)
 
     if not full_path:
-        raise ValueError("Either full_path or bids_root + subject must be provided.")
+        raise ValueError(
+            'Either full_path or bids_root + subject must be provided.'
+        )
 
     sitk_img = sitk.GetImageFromArray(img)
     sitk.WriteImage(sitk_img, full_path)
 
 
-def save_asl_data(asldata, fullpath: str = None, *, bids_root: str = None, subject: str = None, session: str = None):
+def save_asl_data(
+    asldata,
+    fullpath: str = None,
+    *,
+    bids_root: str = None,
+    subject: str = None,
+    session: str = None,
+):
     """
     Save ASL data to a pickle file.
 
@@ -217,10 +235,14 @@ def save_asl_data(asldata, fullpath: str = None, *, bids_root: str = None, subje
         If the provided filename does not end with '.pkl'.
     """
     if bids_root and subject:
-        fullpath = _make_bids_path(bids_root, subject, session, suffix='asl', extension='.pkl')
+        fullpath = _make_bids_path(
+            bids_root, subject, session, suffix='asl', extension='.pkl'
+        )
 
     if not fullpath:
-        raise ValueError("Either fullpath or bids_root + subject must be provided.")
+        raise ValueError(
+            'Either fullpath or bids_root + subject must be provided.'
+        )
 
     if not fullpath.endswith('.pkl'):
         raise ValueError('Filename must be a pickle file (.pkl)')

tests/test_utils.py

@@ -283,9 +283,10 @@ def test_collect_data_volumes_error_if_input_is_less_than_3D():
         collected_volumes, _ = utils.collect_data_volumes(data)
     assert 'data is a 3D volume or higher dimensions' in e.value.args[0]
 
+
 def test_load_image_from_bids_structure_returns_valid_array():
     bids_root = 'tests/files/bids-example/asl001'
-    subject = "Sub103"
+    subject = 'Sub103'
     session = None
     modality = 'asl'
     suffix = None  # m0 is deleted, because it does not exist
@@ -299,4 +300,3 @@ def test_load_image_from_bids_structure_returns_valid_array():
     )
 
     assert img is not None
-