Skip to content

Commit f322964

Browse files
committed
RF: Unconditionally recognize .zstd extension
1 parent 823b97f commit f322964

File tree

4 files changed

+5
-16
lines changed

4 files changed

+5
-16
lines changed

nibabel/analyze.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
from .fileholders import copy_file_map
9696
from .batteryrunners import Report
9797
from .arrayproxy import ArrayProxy
98-
from .openers import HAVE_ZSTD
9998

10099
# Sub-parts of standard analyze header from
101100
# Mayo dbh.h file
@@ -907,9 +906,7 @@ class AnalyzeImage(SpatialImage):
907906
_meta_sniff_len = header_class.sizeof_hdr
908907
files_types = (('image', '.img'), ('header', '.hdr'))
909908
valid_exts = ('.img', '.hdr')
910-
_compressed_suffixes = ('.gz', '.bz2')
911-
if HAVE_ZSTD: # If pyzstd installed., add .zst suffix
912-
_compressed_suffixes = (*_compressed_suffixes, '.zst')
909+
_compressed_suffixes = ('.gz', '.bz2', '.zst')
913910

914911
makeable = True
915912
rw = True

nibabel/brikhead.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
ImageDataError
4444
)
4545
from .volumeutils import Recoder
46-
from .openers import HAVE_ZSTD
4746

4847
# used for doc-tests
4948
filepath = os.path.dirname(os.path.realpath(__file__))
@@ -491,9 +490,7 @@ class AFNIImage(SpatialImage):
491490
header_class = AFNIHeader
492491
valid_exts = ('.brik', '.head')
493492
files_types = (('image', '.brik'), ('header', '.head'))
494-
_compressed_suffixes = ('.gz', '.bz2', '.Z')
495-
if HAVE_ZSTD: # If pyzstd installed., add .zst suffix
496-
_compressed_suffixes = (*_compressed_suffixes, '.zst')
493+
_compressed_suffixes = ('.gz', '.bz2', '.Z', '.zst')
497494
makeable = False
498495
rw = False
499496
ImageArrayProxy = AFNIArrayProxy

nibabel/loadsave.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,13 @@
1313
import numpy as np
1414

1515
from .filename_parser import splitext_addext, _stringify_path
16-
from .openers import ImageOpener, HAVE_ZSTD
16+
from .openers import ImageOpener
1717
from .filebasedimages import ImageFileError
1818
from .imageclasses import all_image_classes
1919
from .arrayproxy import is_proxy
2020
from .deprecated import deprecate_with_version
2121

22-
_compressed_suffixes = ('.gz', '.bz2')
23-
if HAVE_ZSTD: # If pyzstd installed., add .zst suffix
24-
_compressed_suffixes = (*_compressed_suffixes, '.zst')
22+
_compressed_suffixes = ('.gz', '.bz2', '.zst')
2523

2624

2725
def load(filename, **kwargs):

nibabel/minc1.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
from .spatialimages import SpatialHeader, SpatialImage
1818
from .fileslice import canonical_slicers
19-
from .openers import HAVE_ZSTD
2019

2120
_dt_dict = {
2221
('b', 'unsigned'): np.uint8,
@@ -317,9 +316,7 @@ class Minc1Image(SpatialImage):
317316
_meta_sniff_len = 4
318317
valid_exts = ('.mnc',)
319318
files_types = (('image', '.mnc'),)
320-
_compressed_suffixes = ('.gz', '.bz2')
321-
if HAVE_ZSTD: # If pyzstd installed., add .zst suffix
322-
_compressed_suffixes = (*_compressed_suffixes, '.zst')
319+
_compressed_suffixes = ('.gz', '.bz2', '.zst')
323320

324321
makeable = True
325322
rw = False

0 commit comments

Comments
 (0)