Use more modern tempfile methods, ensure tests run, improve writing

Load write_geometry into __init__ file, replace vnum,fnum writing

Author: effigies

nibabel/freesurfer/__init__.py

@@ -2,5 +2,5 @@
 """
 
 from io import read_geometry, read_morph_data, \
-               read_annot, read_label
+               read_annot, read_label, write_geometry
 from mghformat import load, save, MGHImage

nibabel/freesurfer/io.py

@@ -111,9 +111,7 @@ def write_geometry(filepath, create_stamp, coords, faces):
         magic_bytes.tofile(fobj)
         fobj.write("%s\n\n" % create_stamp)
 
-        # On a Linux box, numpy uses opposite byte order to freesurfer
-        np.int32(coords.shape[0]).byteswap().tofile(fobj)
-        np.int32(faces.shape[0]).byteswap().tofile(fobj)
+        np.array([coords.shape[0], faces.shape[0]], dtype='>i4').tofile(fobj)
 
         # Coerce types, just to be safe
         coords.astype('>f4').reshape(-1).tofile(fobj)

nibabel/freesurfer/tests/test_io.py

@@ -1,6 +1,7 @@
 import os
 from os.path import join as pjoin
 import time
+import tempfile
 
 from nose.tools import assert_true
 import numpy as np
@@ -39,13 +40,16 @@ def test_geometry():
 
     # Test equivalence of freesurfer- and nibabel-generated triangular files
     # with respect to read_geometry()
-    surf_path = os.tmpnam()
+    ntf = tempfile.NamedTemporaryFile(delete=False)
+    ntf.close()
+
+    surf_path = ntf.name
     create_stamp = "created by %s on %s" % (os.getlogin(), time.ctime())
     write_geometry(surf_path, create_stamp, coords, faces)
 
     coords2, faces2 = read_geometry(surf_path)
 
-    # Remove 
+    # Remove temporary file
     os.unlink(surf_path)
 
     assert_equal(coords, coords2)