Fixes.

Author: jaeilepp

nibabel/freesurfer/io.py

@@ -182,18 +182,20 @@ def write_geometry(filepath, coords, faces, create_stamp=None,
         faces.astype('>i4').reshape(-1).tofile(fobj)
 
         # Add volume info, if given
-        if volume_info is not None and len(volume_info) > 0:
-            for key, val in volume_info.items():
-                if key == 'head':
-                    np.array(val, dtype='>i4').tofile(fobj)
-                elif key in ('valid', 'filename'):
-                    fobj.write('{0} = {1}\n'.format(key, val).encode('utf-8'))
-                elif key == 'volume':
-                    fobj.write('{0} = {1} {2} {3}\n'.format(
-                        key, val[0], val[1], val[2]).encode('utf-8'))
-                else:
-                    fobj.write('{0} = {1:.4f} {2:.4f} {3:.4f}\n'.format(
-                        key.ljust(6), val[0], val[1], val[2]).encode('utf-8'))
+        if volume_info is None or len(volume_info) == 0:
+            return
+
+        for key, val in volume_info.items():
+            if key == 'head':
+                np.array(val, dtype='>i4').tofile(fobj)
+            elif key in ('valid', 'filename'):
+                fobj.write('{0} = {1}\n'.format(key, val).encode('utf-8'))
+            elif key == 'volume':
+                fobj.write('{0} = {1} {2} {3}\n'.format(
+                    key, val[0], val[1], val[2]).encode('utf-8'))
+            else:
+                fobj.write('{0} = {1:.4f} {2:.4f} {3:.4f}\n'.format(
+                    key.ljust(6), val[0], val[1], val[2]).encode('utf-8'))
 
 
 def read_morph_data(filepath):

nibabel/freesurfer/tests/test_io.py

@@ -56,7 +56,6 @@ def test_geometry():
     assert_equal(coords.shape[0], faces.max() + 1)
 
     surf_path = pjoin(data_path, "surf", "%s.%s" % ("lh", "sphere"))
-    warnings.filterwarnings('always', category=DeprecationWarning)
     coords, faces, volume_info, create_stamp = read_geometry(
         surf_path, read_metadata=True, read_stamp=True)
 
@@ -91,6 +90,7 @@ def test_geometry():
             read_geometry(surf_path, read_metadata=True)
         assert_true(any('volume information contained' in str(ww.message)
                         for ww in w))
+        assert_true(any('extension code' in str(ww.message) for ww in w))
 
     assert_equal(create_stamp, read_create_stamp)