ENH: improved use of InTemporaryDirectory

bthirion · bthirion · commit ece6a1542a3f · 2012-06-19T00:07:46.000+02:00
diff --git a/nipy/labs/spatial_models/tests/test_parcel_io.py b/nipy/labs/spatial_models/tests/test_parcel_io.py
@@ -1,4 +1,4 @@
-from os.path import join, exists
+from os.path import exists
 import numpy as np
 from nibabel import Nifti1Image, save
 from numpy.testing import assert_equal
@@ -43,14 +43,13 @@ def test_parcel_intra_from_3d_image():
     shape = (10, 10, 10)
     n_parcel, nn, mu = 10, 6, 1.
     mask_image = Nifti1Image(np.ones(shape), np.eye(4))
-    dir_context = InTemporaryDirectory()
-    with dir_context:
+    with InTemporaryDirectory() as dir_context:
         surrogate_3d_dataset(mask=mask_image, out_image_file='image.nii')
 
         #run the algo 
         for method in ['ward', 'kmeans', 'gkm']:
             osp = fixed_parcellation(mask_image, ['image.nii'], n_parcel, nn,
-                                     method, dir_context.name, mu)
+                                     method, dir_context, mu)
             result = 'parcel_%s.nii' % method
             assert exists(result)
             assert_equal(osp.k, n_parcel)
@@ -65,15 +64,14 @@ def test_parcel_intra_from_3d_images_list():
     method = 'ward'
     mask_image = Nifti1Image(np.ones(shape), np.eye(4))
 
-    dir_context = InTemporaryDirectory()
-    with dir_context:
+    with InTemporaryDirectory() as dir_context:
         data_image = ['image_%d.nii' % i for i in range(5)]
         for datim in data_image:
             surrogate_3d_dataset(mask=mask_image, out_image_file=datim)
 
         #run the algo
         osp = fixed_parcellation(mask_image, data_image, n_parcel, nn,
-                                 method, dir_context.name, mu)
+                                 method, dir_context, mu)
         assert exists('parcel_%s.nii' % method)
         assert_equal(osp.k, n_parcel)
 
@@ -86,12 +84,11 @@ def test_parcel_intra_from_4d_image():
     n_parcel, nn, mu = 10, 6, 1.
     method = 'ward'
     mask_image = Nifti1Image(np.ones(shape), np.eye(4))
-    dir_context = InTemporaryDirectory()
-    with dir_context:
+    with InTemporaryDirectory() as dir_context:
         surrogate_3d_dataset(n_subj=10, mask=mask_image, 
                              out_image_file='image.nii')    
         osp = fixed_parcellation(mask_image, ['image.nii'], n_parcel, nn,
-                                 method, dir_context.name, mu)
+                                 method, dir_context, mu)
         assert exists('parcel_%s.nii' % method)
         assert_equal(osp.k, n_parcel)
 
