MNT: Drop FileBasedImage.to/from_files(pec) methods, deprecated in 1.0, expired in 3.0

Author: effigies

nibabel/filebasedimages.py

@@ -159,9 +159,9 @@ class FileBasedImage(object):
     itself back to the files pointed to in ``file_map``.  When a file holder
     holds active file-like objects, then these may be affected by the
     initial file read; in this case, the contains file-like objects need to
-    carry the position at which a write (with ``to_files``) should place the
+    carry the position at which a write (with ``to_file_map``) should place the
     data.  The ``file_map`` contents should therefore be such, that this will
-    work:
+    work.
     """
     header_class = FileBasedHeader
     _meta_sniff_len = 0
@@ -263,14 +263,6 @@ def from_filename(klass, filename):
     def from_file_map(klass, file_map):
         raise NotImplementedError
 
-    @classmethod
-    @deprecate_with_version('from_files class method is deprecated.\n'
-                            'Please use the ``from_file_map`` class method '
-                            'instead.',
-                            '1.0', '3.0')
-    def from_files(klass, file_map):
-        return klass.from_file_map(file_map)
-
     @classmethod
     def filespec_to_file_map(klass, filespec):
         """ Make `file_map` for this class from filename `filespec`
@@ -307,14 +299,6 @@ def filespec_to_file_map(klass, filespec):
             file_map[key] = FileHolder(filename=fname)
         return file_map
 
-    @classmethod
-    @deprecate_with_version('filespec_to_files class method is deprecated.\n'
-                            'Please use the "filespec_to_file_map" class '
-                            'method instead.',
-                            '1.0', '3.0')
-    def filespec_to_files(klass, filespec):
-        return klass.filespec_to_file_map(filespec)
-
     def to_filename(self, filename):
         """ Write image to files implied by filename string
 
@@ -332,21 +316,9 @@ def to_filename(self, filename):
         self.file_map = self.filespec_to_file_map(filename)
         self.to_file_map()
 
-    @deprecate_with_version('to_filespec method is deprecated.\n'
-                            'Please use the "to_filename" method instead.',
-                            '1.0', '3.0')
-    def to_filespec(self, filename):
-        self.to_filename(filename)
-
     def to_file_map(self, file_map=None):
         raise NotImplementedError
 
-    @deprecate_with_version('to_files method is deprecated.\n'
-                            'Please use the "to_file_map" method instead.',
-                            '1.0', '3.0')
-    def to_files(self, file_map=None):
-        self.to_file_map(file_map)
-
     @classmethod
     def make_file_map(klass, mapping=None):
         """ Class method to make files holder for this image type

nibabel/spatialimages.py

@@ -108,7 +108,7 @@
 itself back to the files pointed to in ``file_map``.  When a file holder
 holds active file-like objects, then these may be affected by the
 initial file read; in this case, the contains file-like objects need to
-carry the position at which a write (with ``to_files``) should place the
+carry the position at which a write (with ``to_file_map``) should place the
 data.  The ``file_map`` contents should therefore be such, that this will
 work:
 

nibabel/tests/test_removalschedule.py

@@ -23,7 +23,11 @@
 
 ATTRIBUTE_SCHEDULE = [
     ("5.0.0", [("nibabel.dataobj_images", "DataobjImage", "get_data")]),
-    ("4.0.0", [("nibabel.dataobj_images", "DataobjImage", "get_shape")]),
+    ("4.0.0", [("nibabel.dataobj_images", "DataobjImage", "get_shape"),
+               ("nibabel.filebasedimages", "FileBasedImage", "filespec_to_files"),
+               ("nibabel.filebasedimages", "FileBasedImage", "to_filespec"),
+               ("nibabel.filebasedimages", "FileBasedImage", "to_files"),
+               ("nibabel.filebasedimages", "FileBasedImage", "from_files")]),
     # Verify that the test will be quiet if the schedule outlives the modules
     ("1.0.0", [("nibabel.nosuchmod", "anyobj", "anyattr"),
                ("nibabel.nifti1", "nosuchobj", "anyattr"),

nibabel/tests/test_spatialimages.py

@@ -529,35 +529,6 @@ def test_slicer(self):
                             assert (sliced_data == img.get_data()[sliceobj]).all()
                         assert (sliced_data == img.get_fdata()[sliceobj]).all()
 
-    def test_api_deprecations(self):
-
-        class FakeImage(self.image_class):
-
-            files_types = (('image', '.foo'),)
-
-            @classmethod
-            def to_file_map(self, file_map=None):
-                pass
-
-            @classmethod
-            def from_file_map(self, file_map=None):
-                pass
-
-        arr = np.arange(24, dtype=np.int16).reshape((2, 3, 4))
-        aff = np.eye(4)
-        img = FakeImage(arr, aff)
-        bio = BytesIO()
-        file_map = FakeImage.make_file_map({'image': bio})
-
-        with pytest.raises(ExpiredDeprecationError):
-            img.to_files(file_map)
-        with pytest.raises(ExpiredDeprecationError):
-            img.to_filespec('an_image')
-        with pytest.raises(ExpiredDeprecationError):
-            FakeImage.from_files(file_map)
-        with pytest.raises(ExpiredDeprecationError):
-            FakeImage.filespec_to_files('an_image')
-
 
 class MmapImageMixin(object):
     """ Mixin for testing images that may return memory maps """