testing for pathlib

Author: CRiddler

nibabel/tests/test_image_api.py

@@ -27,6 +27,7 @@
 import warnings
 from functools import partial
 from itertools import product
+import pathlib
 
 import numpy as np
 
@@ -144,19 +145,21 @@ def validate_filenames(self, imaker, params):
         assert_almost_equal(img.get_data(), rt_rt_img.get_data())
         # get_ / set_ filename
         fname = 'an_image' + self.standard_extension
-        img.set_filename(fname)
-        assert_equal(img.get_filename(), fname)
-        assert_equal(img.file_map['image'].filename, fname)
+        for path in (fname, pathlib.Path(fname)):
+            img.set_filename(path)
+            assert_equal(img.get_filename(), path)
+            assert_equal(img.file_map['image'].filename, path)
         # to_ / from_ filename
         fname = 'another_image' + self.standard_extension
-        with InTemporaryDirectory():
-            img.to_filename(fname)
-            rt_img = img.__class__.from_filename(fname)
-            assert_array_equal(img.shape, rt_img.shape)
-            assert_almost_equal(img.get_fdata(), rt_img.get_fdata())
-            # get_data will be deprecated
-            assert_almost_equal(img.get_data(), rt_img.get_data())
-            del rt_img  # to allow windows to delete the directory
+        for path in (fname, pathlib.Path(fname)):
+            with InTemporaryDirectory():
+                img.to_filename(path)
+                rt_img = img.__class__.from_filename(path)
+                assert_array_equal(img.shape, rt_img.shape)
+                assert_almost_equal(img.get_fdata(), rt_img.get_fdata())
+                # get_data will be deprecated
+                assert_almost_equal(img.get_data(), rt_img.get_data())
+                del rt_img  # to allow windows to delete the directory
 
     def validate_no_slicing(self, imaker, params):
         img = imaker()

nibabel/tests/test_image_load_save.py

@@ -12,6 +12,7 @@
 import shutil
 from os.path import dirname, join as pjoin
 from tempfile import mkdtemp
+import pathlib
 
 import numpy as np
 
@@ -253,13 +254,14 @@ def test_filename_save():
         try:
             pth = mkdtemp()
             fname = pjoin(pth, 'image' + out_ext)
-            nils.save(img, fname)
-            rt_img = nils.load(fname)
-            assert_array_almost_equal(rt_img.get_data(), data)
-            assert_true(type(rt_img) is loadklass)
-            # delete image to allow file close.  Otherwise windows
-            # raises an error when trying to delete the directory
-            del rt_img
+            for path in (fname, pathlib.Path(fname)):
+                nils.save(img, path)
+                rt_img = nils.load(path)
+                assert_array_almost_equal(rt_img.get_data(), data)
+                assert_true(type(rt_img) is loadklass)
+                # delete image to allow file close.  Otherwise windows
+                # raises an error when trying to delete the directory
+                del rt_img
         finally:
             shutil.rmtree(pth)
 

nibabel/tests/test_loadsave.py

@@ -3,6 +3,7 @@
 
 from os.path import dirname, join as pjoin
 import shutil
+import pathlib
 
 import numpy as np
 
@@ -26,13 +27,16 @@
 
 
 def test_read_img_data():
-    for fname in ('example4d.nii.gz',
-                  'example_nifti2.nii.gz',
-                  'minc1_1_scale.mnc',
-                  'minc1_4d.mnc',
-                  'test.mgz',
-                  'tiny.mnc'
-                  ):
+    fnames_test = [
+        'example4d.nii.gz',
+        'example_nifti2.nii.gz',
+        'minc1_1_scale.mnc',
+        'minc1_4d.mnc',
+        'test.mgz',
+        'tiny.mnc'
+    ]
+    fnames_test += [pathlib.Path(p) for p in fnames_test]
+    for fname in fnames_test:
         fpath = pjoin(data_path, fname)
         img = load(fpath)
         data = img.get_data()