Merge pull request #140 from matthew-brett/py3-nipy-fixes

Py3 nipy fixes.

A couple of fixes to allow nibabel to work with Python 3 nipy.

Author: matthew-brett

nibabel/data.py

@@ -18,7 +18,16 @@
                         'path to the package correctly?')
 
 
-class DataError(OSError):
+class DataError(Exception):
+    pass
+
+
+class BomberError(DataError, AttributeError):
+    """ Error when trying to access Bomber instance
+
+    Should be instance of AttributeError to allow Python 3 inspect to do various
+    ``hasattr`` checks without raising an error
+    """
     pass
 
 
@@ -302,7 +311,7 @@ def __init__(self, name, msg):
 
     def __getattr__(self, attr_name):
         ''' Raise informative error accessing not-found attributes '''
-        raise DataError(
+        raise BomberError(
             'Trying to access attribute "%s" '
             'of non-existent data "%s"\n\n%s\n' %
             (attr_name, self.name, self.msg))

nibabel/nifti1.py

@@ -1779,7 +1779,7 @@ def _write_header(self, header_file, header, slope, inter):
         offset = header.get_data_offset()
         diff = offset-header_file.tell()
         if diff > 0:
-            header_file.write('\x00' * diff)
+            header_file.write(ZEROB * diff)
 
     def update_header(self):
         ''' Harmonize header with image data and affine '''

nibabel/tests/test_data.py

@@ -19,8 +19,7 @@
 
 from nose import with_setup
 
-from nose.tools import assert_equal, \
-    assert_raises, raises
+from nose.tools import (assert_equal, assert_raises, raises, assert_false)
 
 from .test_environment import (setup_environment,
                                teardown_environment,
@@ -241,6 +240,11 @@ def test_bomber():
     res = b.any_attribute
 
 
+def test_bomber_inspect():
+    b = Bomber('bomber example', 'a message')
+    assert_false(hasattr(b, 'any_attribute'))
+
+
 @with_environment
 def test_datasource_or_bomber():
     pkg_def = dict(

nibabel/tests/test_nifti1.py

@@ -469,6 +469,15 @@ def test_set_sform(self):
         # Unexpected keyword raises error
         assert_raises(TypeError, img.get_sform, strange=True)
 
+    def test_hdr_diff(self):
+        # Check an offset beyond data does not raise an error
+        img = self.image_class(np.zeros((2,3,4)), np.eye(4))
+        ext = dict(img.files_types)['image']
+        hdr = img.get_header()
+        hdr['vox_offset'] = 400
+        with InTemporaryDirectory():
+            img.to_filename('another_file' + ext)
+
 
 class TestNifti1Pair(TestNifti1Image):
     # Run analyze-flavor spatialimage tests