Skip to content

Commit d8f1be9

Browse files
matthew-bretteffigies
authored andcommitted
RF: go back to using decorator for .mgz extension
At Ben's suggestion, restore the decorator for now, to simplify discussion of this PR.
1 parent 5600d42 commit d8f1be9

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

nibabel/freesurfer/mghformat.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -455,14 +455,12 @@ def writeftr_to(self, fileobj):
455455

456456

457457
# Register .mgz extension as compressed
458-
ImageOpener.compress_ext_map['.mgz'] = ImageOpener.gz_def
459-
460-
458+
@ImageOpener.register_ext_from_image('.mgz', ImageOpener.gz_def)
461459
class MGHImage(SpatialImage):
462460
""" Class for MGH format image
463461
"""
464462
header_class = MGHHeader
465-
valid_exts = ('.mgh', '.mgz')
463+
valid_exts = ('.mgh',)
466464
files_types = (('image', '.mgh'),)
467465
_compressed_suffixes = ()
468466

nibabel/openers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,6 @@ def decorate(klass):
185185
assert ext not in opener_klass.compress_ext_map, \
186186
"Cannot redefine extension-function mappings."
187187
opener_klass.compress_ext_map[ext] = func_def
188-
klass.alternate_exts += (ext,)
188+
klass.valid_exts += (ext,)
189189
return klass
190190
return decorate

nibabel/tests/test_openers.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ def test_BinOpener():
9393

9494

9595
class TestImageOpener:
96-
alternate_exts = ()
96+
valid_exts = ()
97+
9798
def setUp(self):
9899
self.compress_ext_map = ImageOpener.compress_ext_map.copy()
99100

@@ -119,7 +120,7 @@ def file_opener(fileish, mode):
119120
dec(self.__class__)
120121
assert_equal(n_associations + 1, len(ImageOpener.compress_ext_map))
121122
assert_true('.foo' in ImageOpener.compress_ext_map)
122-
assert_true('.foo' in self.alternate_exts)
123+
assert_true('.foo' in self.valid_exts)
123124

124125
with InTemporaryDirectory():
125126
with ImageOpener('test.foo', 'w'):

0 commit comments

Comments
 (0)