Fix unclosed files (#163)

equinor · Sep 18, 2020 · 476ec50 · 476ec50
1 parent 7a4930b
commit 476ec50
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/fmu/ensemble/ensemble.py b/src/fmu/ensemble/ensemble.py
@@ -397,7 +397,8 @@ def manifest(self, manifest):
                 self._manifest = manifest
         elif isinstance(manifest, six.string_types):
             if os.path.exists(manifest):
-                manifest_fromyaml = yaml.safe_load(open(manifest))
+                with open(manifest) as file_handle:
+                    manifest_fromyaml = yaml.safe_load(file_handle)
                 if not manifest_fromyaml:
                     logger.warning("Empty manifest")
                     self._manifest = {}

diff --git a/src/fmu/ensemble/realization.py b/src/fmu/ensemble/realization.py
@@ -569,7 +569,8 @@ def load_status(self):
         jsonfilename = os.path.join(self._origpath, "jobs.json")
         if jsonfilename and os.path.exists(jsonfilename):
             try:
-                jobsinfo = json.load(open(jsonfilename))
+                with open(jsonfilename) as file_handle:
+                    jobsinfo = json.load(file_handle)
                 jobsinfodf = pd.DataFrame(jobsinfo["jobList"])
                 jobsinfodf["JOBINDEX"] = jobsinfodf.index.astype(int)
                 # Outer merge means that we will also have jobs from
@@ -806,7 +807,8 @@ def find_files(self, paths, metadata=None, metayaml=False):
                     # might be out of luck if you have multiple..
                     for cand in yaml_candidates:
                         if os.path.exists(os.path.join(dirname, cand)):
-                            metadict = yaml.full_load(open(os.path.join(dirname, cand)))
+                            with open(os.path.join(dirname, cand)) as file_handle:
+                                metadict = yaml.full_load(file_handle)
                         continue
 
                     # Flatten metadict:

diff --git a/src/fmu/ensemble/virtualensemble.py b/src/fmu/ensemble/virtualensemble.py
@@ -1096,7 +1096,8 @@ def manifest(self, manifest):
                 self._manifest = manifest
         elif isinstance(manifest, six.string_types):
             if os.path.exists(manifest):
-                manifest_fromyaml = yaml.safe_load(open(manifest))
+                with open(manifest) as file_handle:
+                    manifest_fromyaml = yaml.safe_load(file_handle)
                 if not manifest_fromyaml:
                     logger.warning("Empty manifest")
                     self._manifest = {}