BF+TST - fix indentation error for ecat proxy

Ecat proxy was returning None after first read

Author: matthew-brett

nibabel/ecat.py

@@ -657,9 +657,7 @@ def __array__(self):
                 frame_mapping = self._subheader._mlist.get_frame_order()
                 for i in sorted(frame_mapping):
                     self._data[:,:,:,i] = self._subheader.data_from_fileobj(frame_mapping[i][0])
-                return self._data
-
-
+            return self._data
 
     def __init__(self, data, affine, header,
                  subheader, mlist ,
@@ -672,7 +670,6 @@ def __init__(self, data, affine, header,
 
         Parameters
         ----------
-
         data : None or array-like
             image data
         affine : None or (4,4) array-like
@@ -690,7 +687,6 @@ def __init__(self, data, affine, header,
         file_map : mapping, optional
             mapping giving file information for this image format
 
-
         Examples
         --------
         >>> import os
@@ -705,7 +701,6 @@ def __init__(self, data, affine, header,
         >>> data4d = img.get_data()
         >>> data4d.shape
         (10, 10, 3, 1)
-        
         """
         self._subheader = subheader
         self._mlist = mlist
@@ -729,30 +724,26 @@ def __init__(self, data, affine, header,
     def _set_header(self, header):
         self._header = header
 
-
     def get_data(self):
         """returns scaled data for all frames in a numpy array
         returns as a 4D array """
         if self._data is None:
             raise ImageDataError('No data in this image')
-        return np.asanyarray(self._data)        
-
+        return np.asanyarray(self._data)
 
     def get_affine(self):
         if not self._subheader._check_affines():
             warnings.warn('Affines different across frames, loading affine from FIRST frame',
                           UserWarning )
         return self._affine
-       
-                            
+
     def get_frame_affine(self, frame):
         """returns 4X4 affine"""
-        
         return self._subheader.get_affine(frame=frame)
 
     def get_frame(self,frame):
         return self._subheader.data_from_fileobj(frame)
-        
+
     def get_data_dtype(self,frame):
         subhdr = self._subheader
         dt = subhdr._get_data_dtype(frame)
@@ -771,7 +762,7 @@ def get_mlist(self):
     def get_subheaders(self):
         """get access to subheaders"""
         return self._subheader
-    
+
     @classmethod
     def from_filespec(klass, filespec):
         return klass.from_filename(filespec)
@@ -786,8 +777,6 @@ def _get_fileholders(file_map):
         -------
         header : file holding header data
         image : file holding image data
-
-        
         """
         return file_map['header'], file_map['image']
 
@@ -798,7 +787,7 @@ def from_file_map(klass, file_map):
         hdr_file, img_file = klass._get_fileholders(file_map)
         #note header and image are in same file
         hdr_fid = hdr_file.get_prepare_fileobj(mode = 'rb')
-        header = klass._header.from_fileobj(hdr_fid)        
+        header = klass._header.from_fileobj(hdr_fid)
         hdr_copy = header.copy()
         ### LOAD MLIST
         mlist = klass._mlist(hdr_fid, hdr_copy)
@@ -818,17 +807,16 @@ def from_file_map(klass, file_map):
         img = klass(data, aff, header, subheaders, mlist, extra=None, file_map = file_map)
         return img
 
-
     def to_filename(self, filename):
         """nibabel does not support writing to Ecat filetypes at this time"""
         raise NotImplementedError('nibabel does not allow saving to Ecat'\
                                   ' at this time ')
-      
+
     @classmethod
     def from_image(klass, img):
         raise NotImplementedError("Ecat images can only be generated "\
                                   "from file objects")
-           
+
     @classmethod
     def load(klass, filespec):
         return klass.from_filename(filespec)

nibabel/tests/test_ecat.py

@@ -103,17 +103,17 @@ def test_mlist(self):
         assert_true(mats['matlist'][0,0] +  mats['matlist'][0,3] == 31)
         assert_true(mlist.get_frame_order()[0][0] == 0)
         assert_true(mlist.get_frame_order()[0][1] == 16842758.0)
-        
+
+
 class TestEcatSubHeader(TestCase):
     header_class = EcatHeader
     mlist_class = EcatMlist
     subhdr_class = EcatSubHeader
-    example_file = ecat_file    
+    example_file = ecat_file
     fid = open(example_file, 'rb')
     hdr = header_class.from_fileobj(fid)
-    mlist =  mlist_class(fid, hdr)        
+    mlist =  mlist_class(fid, hdr)
     subhdr = subhdr_class(hdr, mlist, fid)
-    
 
     def test_subheader_size(self):
         assert_equal(self.subhdr_class._subhdrdtype.itemsize, 242)
@@ -134,7 +134,6 @@ def test_subheader(self):
         assert_equal(dat.shape, self.subhdr.get_shape())
         scale_factor = self.subhdr.subheaders[0]['scale_factor']
         assert_equal(self.subhdr.subheaders[0]['scale_factor'].item(),1.0)
-        
         ecat_calib_factor = self.hdr['ecat_calibration_factor']
         assert_equal(ecat_calib_factor, 25007614.0)
         scaled_dat = self.subhdr.data_from_fileobj()
@@ -161,5 +160,16 @@ def test_data(self):
         assert_equal(dat.shape, self.img.shape)
         frame = self.img.get_frame(0)
         assert_array_equal(frame, dat[:,:,:,0])
-    
-        
+
+    def test_array_proxy(self):
+        # Get the cached data copy
+        dat = self.img.get_data()
+        # Make a new one to test arrayproxy
+        img = self.image_class.load(self.example_file)
+        # Maybe we will promote _data to public, but I know this looks bad
+        secret_data = img._data
+        data2 = np.array(secret_data)
+        assert_array_equal(data2, dat)
+        # Check it rereads
+        data3 = np.array(secret_data)
+        assert_array_equal(data3, dat)