Use 'with' statements.

[portage.git] / pym / portage / util / __init__.py

diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py
index 8f311bf3b77e6252159b408aa3d50e328de39b0d..e94849f8a3cb5617a675c7494028d0d420849e20 100644 (file)
--- a/pym/portage/util/__init__.py
+++ b/pym/portage/util/__init__.py
@@ -406,16 +406,15 @@ def read_corresponding_eapi_file(filename, default="0"):
 
        eapi = None
        try:
-               f = io.open(_unicode_encode(eapi_file,
+               with io.open(_unicode_encode(eapi_file,
                        encoding=_encodings['fs'], errors='strict'),
-                       mode='r', encoding=_encodings['repo.content'], errors='replace')
-               lines = f.readlines()
+                       mode='r', encoding=_encodings['repo.content'], errors='replace') as f:
+                       lines = f.readlines()
                if len(lines) == 1:
                        eapi = lines[0].rstrip("\n")
                else:
                        writemsg(_("--- Invalid 'eapi' file (doesn't contain exactly one line): %s\n") % (eapi_file),
                                noiselevel=-1)
-               f.close()
        except IOError:
                pass
 
@@ -546,14 +545,13 @@ def grablines(myfilename, recursive=0, remember_source_file=False):
 
        else:
                try:
-                       myfile = io.open(_unicode_encode(myfilename,
+                       with io.open(_unicode_encode(myfilename,
                                encoding=_encodings['fs'], errors='strict'),
-                               mode='r', encoding=_encodings['content'], errors='replace')
-                       if remember_source_file:
-                               mylines = [(line, myfilename) for line in myfile.readlines()]
-                       else:
-                               mylines = myfile.readlines()
-                       myfile.close()
+                               mode='r', encoding=_encodings['content'], errors='replace') as myfile:
+                               if remember_source_file:
+                                       mylines = [(line, myfilename) for line in myfile.readlines()]
+                               else:
+                                       mylines = myfile.readlines()
                except IOError as e:
                        if e.errno == PermissionDenied.errno:
                                raise PermissionDenied(myfilename)