RF - allow lists and arrays for shape

Shape was assumed a tuple.

Author: matthew-brett

nibabel/nifti1.py

@@ -674,6 +674,7 @@ def set_data_shape(self, shape):
         '''
         # Apply freesurfer hack for vector
         hdr = self._structarr
+        shape = tuple(shape)
         if (len(shape) == 3 and shape[1:] == (1, 1) and
             shape[0] > np.iinfo(hdr['dim'].dtype.base).max): # Freesurfer case
             try:

nibabel/tests/test_analyze.py

@@ -234,6 +234,11 @@ def test_shapes(self):
         assert_equal(hdr.get_data_shape(), shape)
         shape = (mx+1,)
         assert_raises(HeaderDataError, hdr.set_data_shape, shape)
+        # Lists or tuples or arrays will work for setting shape
+        shape = (2, 3, 4)
+        for constructor in (list, tuple, np.array):
+            hdr.set_data_shape(constructor(shape))
+            assert_equal(hdr.get_data_shape(), shape)
 
     def test_read_write_data(self):
         # Check reading and writing of data

nibabel/tests/test_nifti1.py

@@ -206,6 +206,11 @@ def test_freesurfer_hack(self):
         hdr.set_data_shape((-1,1,1))
         hdr['glmin'] = 0
         assert_raises(HeaderDataError, hdr.get_data_shape)
+        # Lists or tuples or arrays will work for setting shape
+        for shape in ((too_big-1, 1, 1), (too_big, 1, 1)):
+            for constructor in (list, tuple, np.array):
+                hdr.set_data_shape(constructor(shape))
+                assert_equal(hdr.get_data_shape(), shape)
 
 
 class TestNifti1SingleHeader(TestNifti1PairHeader):