Style issues, use capsys

Author: JulianKlug

bin/nib-stats.py

@@ -27,6 +27,7 @@ def _get_parser():
                    choices=("mm3", "vox"), help="Preferred output units")
     return p
 
+
 def main(args=None):
     """Main program function."""
     parser = _get_parser()

nibabel/cmdline/stats.py

@@ -17,18 +17,7 @@
 from nibabel import Nifti1Image
 
 
-class Capturing(list):
-    def __enter__(self):
-        self._stdout = sys.stdout
-        sys.stdout = self._stringio = StringIO()
-        return self
-    def __exit__(self, *args):
-        self.extend(self._stringio.getvalue().splitlines())
-        del self._stringio    # free up some memory
-        sys.stdout = self._stdout
-
-
-def test_volume(tmpdir):
+def test_volume(tmpdir, capsys):
     mask_data = np.zeros((20, 20, 20), dtype='u1')
     mask_data[5:15, 5:15, 5:15] = 1
     img = Nifti1Image(mask_data, np.eye(4))
@@ -37,11 +26,11 @@ def test_volume(tmpdir):
     save(img, infile)
 
     args = (f"{infile} --Volume")
-    with Capturing() as vol_mm3:
-        main(args.split())
+    main(args.split())
+    vol_mm3 = capsys.readouterr()
     args = (f"{infile} --Volume --units vox")
-    with Capturing() as vol_vox:
-        main(args.split())
+    main(args.split())
+    vol_vox = capsys.readouterr()
 
     assert float(vol_mm3[0]) == 1000.0
     assert int(vol_vox[0]) == 1000

nibabel/cmdline/tests/test_stats.py

@@ -215,4 +215,3 @@ def _aff_is_diag(aff):
     """ Utility function returning True if affine is nearly diagonal """
     rzs_aff = aff[:3, :3]
     return np.allclose(rzs_aff, np.diag(np.diag(rzs_aff)))
-

nibabel/funcs.py

@@ -13,6 +13,7 @@
 import numpy as np
 from nibabel.imageclasses import spatial_axes_first
 
+
 def count_nonzero_voxels(img):
     """
     Count number of non-zero voxels
@@ -30,6 +31,7 @@ def count_nonzero_voxels(img):
     """
     return np.count_nonzero(img.dataobj)
 
+
 def mask_volume(img):
     """ Compute volume of mask image.