MNT: Complete deprecations in spatialimages

Author: effigies

nibabel/spatialimages.py

@@ -21,9 +21,6 @@
 methods:
 
    * .get_fdata()
-   * .get_data() (deprecated, use get_fdata() instead)
-   * .get_affine() (deprecated, use affine property instead)
-   * .get_header() (deprecated, use header property instead)
    * .to_filename(fname) - writes data to filename(s) derived from
      ``fname``, where the derivation may differ between formats.
    * to_file_map() - save image to files with which the image is already
@@ -141,7 +138,6 @@
 from .viewers import OrthoSlicer3D
 from .volumeutils import shape_zoom_affine
 from .fileslice import canonical_slicers
-from .deprecated import deprecate_with_version
 from .orientations import apply_orientation, inv_ornt_aff
 
 
@@ -307,17 +303,6 @@ def supported_np_types(obj):
     return set(supported)
 
 
-class Header(SpatialHeader):
-    """Alias for SpatialHeader; kept for backwards compatibility."""
-
-    @deprecate_with_version('Header class is deprecated.\n'
-                            'Please use SpatialHeader instead.'
-                            'instead.',
-                            '2.1', '4.0')
-    def __init__(self, *args, **kwargs):
-        super(Header, self).__init__(*args, **kwargs)
-
-
 class ImageDataError(Exception):
     pass
 
@@ -527,15 +512,6 @@ def get_data_dtype(self):
     def set_data_dtype(self, dtype):
         self._header.set_data_dtype(dtype)
 
-    @deprecate_with_version('get_affine method is deprecated.\n'
-                            'Please use the ``img.affine`` property '
-                            'instead.',
-                            '2.1', '4.0')
-    def get_affine(self):
-        """ Get affine from image
-        """
-        return self.affine
-
     @classmethod
     def from_image(klass, img):
         """ Class method to create new instance of own class from `img`

nibabel/tests/test_ecat.py

@@ -240,10 +240,6 @@ def test_isolation(self):
         aff[0, 0] = 99
         assert not np.all(img.affine == aff)
 
-    def test_get_affine_deprecated(self):
-        with pytest.raises(ExpiredDeprecationError):
-            self.img.get_affine()
-
     def test_float_affine(self):
         # Check affines get converted to float
         img_klass = self.image_class

nibabel/tests/test_image_api.py

@@ -502,8 +502,7 @@ def validate_header_shape(self, imaker, params):
 class AffineMixin:
     """ Adds test of affine property, method
 
-    Add this one if your image has an ``affine`` property.  If so, it should
-    (for now) also have a ``get_affine`` method returning the same result.
+    Add this one if your image has an ``affine`` property.
     """
 
     def validate_affine(self, imaker, params):
@@ -517,12 +516,6 @@ def validate_affine(self, imaker, params):
         with pytest.raises(AttributeError):
             img.affine = np.eye(4)
 
-    def validate_affine_deprecated(self, imaker, params):
-        # Check deprecated affine API
-        img = imaker()
-        with pytest.raises(ExpiredDeprecationError):
-            img.get_affine()
-
 
 class SerializeMixin:
     def validate_to_from_stream(self, imaker, params):

nibabel/tests/test_spatialimages.py

@@ -15,7 +15,7 @@
 import numpy as np
 
 from io import BytesIO
-from ..spatialimages import SpatialHeader, SpatialImage, HeaderDataError, Header
+from ..spatialimages import SpatialHeader, SpatialImage, HeaderDataError
 from ..imageclasses import spatial_axes_first
 
 import pytest
@@ -30,7 +30,6 @@
 )
 
 from ..tmpdirs import InTemporaryDirectory
-from ..deprecator import ExpiredDeprecationError
 from .. import load as top_load
 
 def test_header_init():
@@ -605,10 +604,3 @@ def test_load_mmap(self):
                     func(param1, mmap='rw')
                 with pytest.raises(ValueError):
                     func(param1, mmap='r+')
-
-
-def test_header_deprecated():
-    class MyHeader(Header):
-        pass
-    with pytest.raises(ExpiredDeprecationError):
-        MyHeader()