MNT: Remove imagclasses.{ext,class}_map

Author: effigies

nibabel/__init__.py

@@ -61,7 +61,7 @@
 from .orientations import (io_orientation, orientation_affine,
                            flip_axis, OrientationError,
                            apply_orientation, aff2axcodes)
-from .imageclasses import class_map, ext_map, all_image_classes
+from .imageclasses import all_image_classes
 from . import mriutils
 from . import streamlines
 from . import viewers

nibabel/imageclasses.py

@@ -20,12 +20,6 @@
 from .parrec import PARRECImage
 from .spm99analyze import Spm99AnalyzeImage
 from .spm2analyze import Spm2AnalyzeImage
-from .volumeutils import Recoder
-from .deprecated import deprecate_with_version
-
-from .optpkg import optional_package
-_, have_scipy, _ = optional_package('scipy')
-
 
 # Ordered by the load/save priority.
 all_image_classes = [Nifti1Pair, Nifti1Image, Nifti2Pair,
@@ -34,88 +28,6 @@
                      Minc1Image, Minc2Image, MGHImage,
                      PARRECImage, GiftiImage, AFNIImage]
 
-
-# DEPRECATED: mapping of names to classes and class functionality
-class ClassMapDict(dict):
-
-    @deprecate_with_version('class_map is deprecated.',
-                            '2.1', '4.0')
-    def __getitem__(self, *args, **kwargs):
-        return super(ClassMapDict, self).__getitem__(*args, **kwargs)
-
-
-class_map = ClassMapDict(
-    analyze={'class': AnalyzeImage,  # Image class
-             'ext': '.img',  # characteristic image extension
-             'has_affine': False,  # class can store an affine
-             'makeable': True,  # empty image can be easily made in memory
-             'rw': True},  # image can be written
-    spm99analyze={'class': Spm99AnalyzeImage,
-                  'ext': '.img',
-                  'has_affine': True,
-                  'makeable': True,
-                  'rw': have_scipy},
-    spm2analyze={'class': Spm2AnalyzeImage,
-                 'ext': '.img',
-                 'has_affine': True,
-                 'makeable': True,
-                 'rw': have_scipy},
-    nifti_pair={'class': Nifti1Pair,
-                'ext': '.img',
-                'has_affine': True,
-                'makeable': True,
-                'rw': True},
-    nifti_single={'class': Nifti1Image,
-                  'ext': '.nii',
-                  'has_affine': True,
-                  'makeable': True,
-                  'rw': True},
-    minc={'class': Minc1Image,
-          'ext': '.mnc',
-          'has_affine': True,
-          'makeable': True,
-          'rw': False},
-    mgh={'class': MGHImage,
-         'ext': '.mgh',
-         'has_affine': True,
-         'makeable': True,
-         'rw': True},
-    mgz={'class': MGHImage,
-         'ext': '.mgz',
-         'has_affine': True,
-         'makeable': True,
-         'rw': True},
-    par={'class': PARRECImage,
-         'ext': '.par',
-         'has_affine': True,
-         'makeable': False,
-         'rw': False},
-    afni={'class': AFNIImage,
-          'ext': '.brik',
-          'has_affine': True,
-          'makeable': False,
-          'rw': False})
-
-
-class ExtMapRecoder(Recoder):
-
-    @deprecate_with_version('ext_map is deprecated.',
-                            '2.1', '4.0')
-    def __getitem__(self, *args, **kwargs):
-        return super(ExtMapRecoder, self).__getitem__(*args, **kwargs)
-
-
-# mapping of extensions to default image class names
-ext_map = ExtMapRecoder((
-    ('nifti_single', '.nii'),
-    ('nifti_pair', '.img', '.hdr'),
-    ('minc', '.mnc'),
-    ('mgh', '.mgh'),
-    ('mgz', '.mgz'),
-    ('par', '.par'),
-    ('brik', '.brik')
-))
-
 # Image classes known to require spatial axes to be first in index ordering.
 # When adding an image class, consider whether the new class should be listed
 # here.

nibabel/tests/test_imageclasses.py

@@ -14,10 +14,9 @@
 from nibabel.nifti2 import Nifti2Image
 
 from nibabel import imageclasses
-from nibabel.imageclasses import spatial_axes_first, class_map, ext_map
+from nibabel.imageclasses import spatial_axes_first
 
 from nibabel.optpkg import optional_package
-from nibabel.deprecator import ExpiredDeprecationError
 
 have_h5py = optional_package('h5py')[1]
 
@@ -49,11 +48,3 @@ def test_spatial_axes_first():
         img = nib.load(pjoin(DATA_DIR, fname))
         assert len(img.shape) == 4
         assert not spatial_axes_first(img)
-
-
-def test_deprecations():
-    with pytest.raises(ExpiredDeprecationError):
-        class_map['nifti_single']
-    with pytest.raises(ExpiredDeprecationError):
-        nifti_ext = ext_map['.nii']
-