Skip to content

Commit 2ebc4eb

Browse files
committed
ENH: Drop fancy indexing
1 parent 6d05c77 commit 2ebc4eb

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

nibabel/minc1.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,7 @@ def _check_slicing(self, slicer, return_spatial=False):
342342
Validated slicer object that will slice image's `dataobj`
343343
without collapsing spatial dimensions
344344
'''
345+
slicer = canonical_slicers(slicer, self.shape)
345346
try:
346347
all_slices = super(Minc1Image, self)._check_slicing(slicer, False)
347348
sp_dims = self._spatial_dims

nibabel/spatialimages.py

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -337,27 +337,13 @@ def __init__(self, img):
337337

338338
def __getitem__(self, slicer):
339339
try:
340-
slicer = self.img._check_slicing(self._arr_to_slice(slicer))
340+
slicer = self.img._check_slicing(slicer)
341341
except ValueError as err:
342342
raise IndexError(*err.args)
343343
dataobj = self.img.dataobj[slicer]
344344
affine = self.img._slice_affine(slicer)
345345
return self.img.__class__(dataobj.copy(), affine, self.img.header)
346346

347-
def _arr_to_slice(self, slicer):
348-
''' Convert single item sequence indices to slices '''
349-
if not isinstance(slicer, tuple):
350-
slicer = (slicer,)
351-
352-
out = []
353-
for subslicer in slicer:
354-
arr = np.asarray(subslicer)
355-
if arr.shape == (1,):
356-
subslicer = slice(arr[0], arr[0] + 1)
357-
out.append(subslicer)
358-
359-
return tuple(out)
360-
361347
def __init__(self, dataobj, affine, header=None,
362348
extra=None, file_map=None):
363349
''' Initialize image

0 commit comments

Comments
 (0)