RF+TEST - make tests for present data explicit - thanks to Marc-Alexandre Cote

Author: matthew-brett

nibabel/nifti1.py

@@ -553,9 +553,9 @@ def write_to(self, fileobj):
     def get_best_affine(self):
         ''' Select best of available transforms '''
         hdr = self._header_data
-        if hdr['sform_code']:
+        if hdr['sform_code'] != 0:
             return self.get_sform()
-        if hdr['qform_code']:
+        if hdr['qform_code'] != 0:
             return self.get_qform()
         return self.get_base_affine()
 

nibabel/spatialimages.py

@@ -334,7 +334,7 @@ def get_data(self):
 
     @property
     def shape(self):
-        if self._data:
+        if not self._data is None:
             return self._data.shape
 
     def get_data_dtype(self):

nibabel/tests/test_spatialimages.py

@@ -198,3 +198,12 @@ def test_data_default(self):
         header = hdr_klass()
         img = img_klass(data, affine, header)
         yield assert_equal(img.get_data_dtype(), np.dtype(np.float32))
+
+    def test_data_shape(self):
+        # Check shape correctly read
+        img_klass = self.image_class
+        img = img_klass(None, np.eye(4))
+        assert_true(img.shape is None)
+        img = img_klass(np.zeros((2,3,4)), np.eye(4))
+        assert_equal(img.shape, (2,3,4))
+