Merge pull request #2020 from zploskey/close_opened_files

theano/gof/cmodule.py

@@ -476,8 +476,8 @@ class KeyData(object):
         """
         # Note that writing in binary mode is important under Windows.
         try:
-            cPickle.dump(self, open(self.key_pkl, 'wb'),
-                         protocol=cPickle.HIGHEST_PROTOCOL)
+            with open(self.key_pkl, 'wb') as f:
+                cPickle.dump(self, f, protocol=cPickle.HIGHEST_PROTOCOL)
         except cPickle.PicklingError:
             _logger.warning("Cache leak due to unpickle-able key data %s",
                             self.keys)
@@ -681,7 +681,8 @@ class ModuleCache(object):
                                          "unpickle cache file %s", key_pkl)
 
                         try:
-                            key_data = cPickle.load(open(key_pkl, 'rb'))
+                            with open(key_pkl, 'rb') as f:
+                                key_data = cPickle.load(f)
                         except EOFError:
                             # Happened once... not sure why (would be worth
                             # investigating if it ever happens again).
@@ -1126,7 +1127,9 @@ class ModuleCache(object):
         # Verify that when we reload the KeyData from the pickled file, the
         # same key can be found in it, and is not equal to more than one
         # other key.
-        key_data = cPickle.load(open(key_pkl, 'rb'))
+        with open(key_pkl, 'rb') as f:
+            key_data = cPickle.load(f)
+
         found = sum(key == other_key for other_key in key_data.keys)
         msg = ''
         if found == 0:

theano/gof/compilelock.py

@@ -178,13 +178,15 @@ def lock(tmp_dir, timeout=120, min_wait=5, max_wait=10, verbosity=1):
             other_dead = False
             while os.path.isdir(tmp_dir):
                 try:
-                    read_owner = open(lock_file).readlines()[0].strip()
-                    # the try is transtion code for old locks
-                    # it may be removed when poeple have upgraded
+                    with open(lock_file) as f:
+                        read_owner = f.readlines()[0].strip()
+
+                    # The try is transition code for old locks.
+                    # It may be removed when people have upgraded.
                     try:
                         other_host = read_owner.split('_')[2]
                     except IndexError:
-                        other_host = () # make sure it isn't equal to any host
+                        other_host = ()  # make sure it isn't equal to any host
                     if other_host == socket.gethostname():
                         try:
                             os.kill(int(read_owner.split('_')[0]), 0)
@@ -250,7 +252,9 @@ def lock(tmp_dir, timeout=120, min_wait=5, max_wait=10, verbosity=1):
 
             # Verify we are really the lock owner (this should not be needed,
             # but better be safe than sorry).
-            owner = open(lock_file).readlines()[0].strip()
+            with open(lock_file) as f:
+                owner = f.readlines()[0].strip()
+
             if owner != unique_id:
                 # Too bad, try again.
                 continue

theano/misc/windows.py

@@ -46,15 +46,15 @@ def call_subprocess_Popen(command, **params):
     """
     if 'stdout' in params or 'stderr' in params:
         raise TypeError("don't use stderr or stdout with call_subprocess_Popen")
-    null = open(os.devnull, 'wb')
-    # stdin to devnull is a workaround for a crash in a weird Windows
-    # environement where sys.stdin was None
-    params.setdefault('stdin', null)
-    params['stdout'] = null
-    params['stderr'] = null
-    p = subprocess_Popen(command, **params)
-    p.wait()
-    return p.returncode
+    with open(os.devnull, 'wb') as null:
+        # stdin to devnull is a workaround for a crash in a weird Windows
+        # environment where sys.stdin was None
+        params.setdefault('stdin', null)
+        params['stdout'] = null
+        params['stderr'] = null
+        p = subprocess_Popen(command, **params)
+        returncode = p.wait()
+    return returncode
 
 def output_subprocess_Popen(command, **params):
     """

theano/tests/run_tests_in_batch.py

@@ -152,7 +152,10 @@ def run(stdout, stderr, argv, theano_nose, batch_size, time_profile,
     stderr.flush()
     assert rval == 0
     noseids_file = '.noseids'
-    data = cPickle.load(open(noseids_file, 'rb'))
+
+    with open(noseids_file, 'rb') as f: 
+        data = cPickle.load(f)
+
     ids = data['ids']
     n_tests = len(ids)
     if n_tests == 0:
@@ -193,8 +196,9 @@ def run(stdout, stderr, argv, theano_nose, batch_size, time_profile,
             # otherwise this field may get erased. We use a set because it
             # seems like it is not systematically erased though, and we want
             # to avoid duplicates.
-            failed = failed.union(cPickle.load(open(noseids_file, 'rb'))
-                                  ['failed'])
+            with open(noseids_file, 'rb') as f:
+                failed = failed.union(cPickle.load(f)['failed'])
+
             print '%s%% done in %.3fs (failed: %s)' % (
                 (test_range[-1] * 100) // n_tests, t1 - t0, len(failed))
         # Sort for cosmetic purpose only.