FIX: Minor fixes

Author: larsoner

nibabel/nicom/dicomwrappers.py

@@ -304,7 +304,7 @@ def get_affine(self):
         # column, slice)
         vox = self.voxel_sizes
         ipp = self.image_position
-        if orient is None or vox is None or ipp is None:
+        if any(p is None for p in (orient, vox, ipp)):
             raise WrapperError('Not enough information for affine')
         aff = np.eye(4)
         aff[:3, :3] = orient * np.array(vox)

nibabel/tests/test_analyze.py

@@ -152,9 +152,9 @@ def test_log_checks(self):
         # datatype not supported
         hdr['datatype'] = 255 # severity 40
         fhdr, message, raiser = self.log_chk(hdr, 40)
-        #assert_equal(message, 'data code 255 not supported; '
-        #                   'not attempting fix')
-        #assert_raises(*raiser)
+        assert_equal(message, 'data code 255 not supported; '
+                     'not attempting fix')
+        assert_raises(*raiser)
         # bitpix
         hdr = HC()
         hdr['datatype'] = 16 # float32