tests pathlib compatible

nipy · Oct 16, 2019 · e98dbfc · e98dbfc
1 parent ca10c44
commit e98dbfc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/nibabel/tests/test_image_api.py b/nibabel/tests/test_image_api.py
@@ -144,8 +144,8 @@ def validate_filenames(self, imaker, params):
         fname = 'an_image' + self.standard_extension
         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)
+            assert_equal(img.get_filename(), str(path))
+            assert_equal(img.file_map['image'].filename, str(path))
         # to_ / from_ filename
         fname = 'another_image' + self.standard_extension
         for path in (fname, pathlib.Path(fname)):

diff --git a/nibabel/tests/test_image_load_save.py b/nibabel/tests/test_image_load_save.py
@@ -259,7 +259,7 @@ def test_filename_save():
             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_array_almost_equal(rt_img.get_fdata(), 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

diff --git a/nibabel/tests/test_loadsave.py b/nibabel/tests/test_loadsave.py
@@ -37,7 +37,10 @@ def test_read_img_data():
     ]
     fnames_test += [pathlib.Path(p) for p in fnames_test]
     for fname in fnames_test:
-        fpath = pjoin(data_path, fname)
+        # os.path.join doesnt work between str / os.PathLike in py3.5
+        fpath = pjoin(data_path, str(fname))
+        if isinstance(fname, pathlib.Path):
+            fpath = pathlib.Path(fpath)
         img = load(fpath)
         data = img.get_fdata()
         data2 = read_img_data(img)
@@ -49,8 +52,11 @@ def test_read_img_data():
             assert_array_equal(read_img_data(img, prefer='unscaled'), data)
         # Assert all caps filename works as well
         with TemporaryDirectory() as tmpdir:
-            up_fpath = pjoin(tmpdir, fname.upper())
-            shutil.copyfile(fpath, up_fpath)
+            up_fpath = pjoin(tmpdir, str(fname).upper())
+            if isinstance(fname, pathlib.Path):
+                up_fpath = pathlib.Path(up_fpath)
+            # shutil doesnt work with os.PathLike in py3.5
+            shutil.copyfile(str(fpath), str(up_fpath))
             img = load(up_fpath)
             assert_array_equal(img.dataobj, data)
             del img