Merge d1958ff into e360db9

Author: rahulporuri

mayavi/tests/test_csv_sniff.py

@@ -66,7 +66,8 @@ def test_API(self):
                   dtype=[('A', float), ('B', float), ('C', float)])
         self.assertNamedClose(x, y)
 
-        y = loadtxt(fo, **s.kwds())
+        with open(fo) as fh:
+            y = loadtxt(fh, **s.kwds())
         self.assertNamedClose(x, y)
 
         y = loadtxt_unknown(fo)
@@ -154,7 +155,8 @@ def check(self, name, skip_if_win=False):
         if not sys.platform.startswith('win'):
             nan = float('nan') # must be in namespace for some .py files
 
-        d = eval(open(f_py).read())
+        with open(f_py) as fh:
+            d = eval(fh.read())
 
         self.assertEqual(d['kwds'], s.kwds())
         self.assertNamedClose(d['array'], s.loadtxt())

mayavi/tools/data_wizards/csv_sniff.py

@@ -171,7 +171,9 @@ def loadtxt(self):
         """ Return the array (by using numpy.loadtxt), using the sniffed
             information in the keyword arguments.
         """
-        return loadtxt(self._filename, **self.kwds())
+        with open(self._filename) as fh:
+            data = loadtxt(fh, **self.kwds())
+        return data
 
 
 def loadtxt_unknown(filename, verbose=0):