Skip to content

Commit fce4cad

Browse files
matthew-bretteffigies
authored andcommitted
RF: rename compressed_exts to compressed_suffxes
Make clear that these are extra suffixes on the filename indicating the file is compressed, as opposed to something like '.mgz' which is not a suffix, but an alternative extension.
1 parent 0c06464 commit fce4cad

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

nibabel/analyze.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ class AnalyzeImage(SpatialImage):
911911
_meta_sniff_len = header_class.sizeof_hdr
912912
files_types = (('image', '.img'), ('header', '.hdr'))
913913
valid_exts = ('.img', '.hdr')
914-
_compressed_exts = ('.gz', '.bz2')
914+
_compressed_suffixes = ('.gz', '.bz2')
915915

916916
makeable = True
917917
rw = True

nibabel/freesurfer/mghformat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ class MGHImage(SpatialImage):
464464
header_class = MGHHeader
465465
valid_exts = ('.mgh', '.mgz')
466466
files_types = (('image', '.mgh'),)
467-
_compressed_exts = ()
467+
_compressed_suffixes = ()
468468

469469
makeable = True
470470
rw = True

nibabel/loadsave.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def save(img, filename):
9393
return
9494

9595
# Be nice to users by making common implicit conversions
96-
froot, ext, trailing = splitext_addext(filename, img._compressed_exts)
96+
froot, ext, trailing = splitext_addext(filename, ('.gz', '.bz2'))
9797
lext = ext.lower()
9898

9999
# Special-case Nifti singles and Pairs

nibabel/minc1.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ class Minc1Image(SpatialImage):
301301
_meta_sniff_len = 4
302302
valid_exts = ('.mnc',)
303303
files_types = (('image', '.mnc'),)
304-
_compressed_exts = ('.gz', '.bz2')
304+
_compressed_suffixes = ('.gz', '.bz2')
305305

306306
makeable = True
307307
rw = False

nibabel/minc2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ class Minc2Image(Minc1Image):
152152
the MINC file on load.
153153
'''
154154
# MINC2 does not do compressed whole files
155-
_compressed_exts = ()
155+
_compressed_suffixes = ()
156156
header_class = Minc2Header
157157

158158
@classmethod

nibabel/spatialimages.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,12 @@
137137
except NameError: # python 3
138138
basestring = str
139139

140-
import os.path
141140
import warnings
142141

143142
import numpy as np
144143

145-
from .filename_parser import types_filenames, TypesFilenamesError, \
146-
splitext_addext
144+
from .filename_parser import (types_filenames, TypesFilenamesError,
145+
splitext_addext)
147146
from .fileholders import FileHolder
148147
from .openers import ImageOpener
149148
from .volumeutils import shape_zoom_affine
@@ -327,7 +326,7 @@ class SpatialImage(object):
327326
_meta_sniff_len = 0
328327
files_types = (('image', None),)
329328
valid_exts = ()
330-
_compressed_exts = ()
329+
_compressed_suffixes = ()
331330

332331
makeable = True # Used in test code
333332
rw = True # Used in test code
@@ -753,7 +752,7 @@ def filespec_to_file_map(klass, filespec):
753752
try:
754753
filenames = types_filenames(
755754
filespec, klass.files_types,
756-
trailing_suffixes=klass._compressed_exts)
755+
trailing_suffixes=klass._compressed_suffixes)
757756
except TypesFilenamesError:
758757
raise ImageFileError(
759758
'Filespec "{0}" does not look right for class {1}'.format(
@@ -877,11 +876,12 @@ def from_image(klass, img):
877876
@classmethod
878877
def _sniff_meta_for(klass, filename, sniff_nbytes):
879878
froot, ext, trailing = splitext_addext(filename,
880-
klass._compressed_exts)
879+
klass._compressed_suffixes)
881880
# Determine the metadata location, then sniff it
882-
t_fnames = types_filenames(filename,
883-
klass.files_types,
884-
trailing_suffixes=klass._compressed_exts)
881+
t_fnames = types_filenames(
882+
filename,
883+
klass.files_types,
884+
trailing_suffixes=klass._compressed_suffixes)
885885
meta_fname = t_fnames.get('header', filename)
886886
try:
887887
with ImageOpener(meta_fname, 'rb') as fobj:
@@ -893,7 +893,7 @@ def _sniff_meta_for(klass, filename, sniff_nbytes):
893893
@classmethod
894894
def path_maybe_image(klass, filename, sniff=None, sniff_max=1024):
895895
froot, ext, trailing = splitext_addext(filename,
896-
klass._compressed_exts)
896+
klass._compressed_suffixes)
897897
if ext.lower() not in klass.valid_exts:
898898
return False, sniff
899899
if not hasattr(klass.header_class, 'may_contain_header'):

0 commit comments

Comments
 (0)