aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-08-24 19:25:59 -0700
committerZac Medico <zmedico@gentoo.org>2011-08-24 19:25:59 -0700
commita12c63842b28e29f3bc6718e6d940d5b697f010f (patch)
treecb1e1f4a102a369591dc70355987e8c81e7c2f4d /pym/portage/repository
parentElementTree: use iter if available (bug #380565) (diff)
downloadportage-a12c63842b28e29f3bc6718e6d940d5b697f010f.tar.gz
portage-a12c63842b28e29f3bc6718e6d940d5b697f010f.tar.bz2
portage-a12c63842b28e29f3bc6718e6d940d5b697f010f.zip
python3.2 fixes: ResourceWarning: unclosed file
Diffstat (limited to 'pym/portage/repository')
-rw-r--r--pym/portage/repository/config.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
index ac9793e4a..a12bd7bc5 100644
--- a/pym/portage/repository/config.py
+++ b/pym/portage/repository/config.py
@@ -137,14 +137,19 @@ class RepoConfig(object):
Returns repo_name, missing.
"""
repo_name_path = os.path.join(repo_path, REPO_NAME_LOC)
+ f = None
try:
- return io.open(
+ f = io.open(
_unicode_encode(repo_name_path,
encoding=_encodings['fs'], errors='strict'),
mode='r', encoding=_encodings['repo.content'],
- errors='replace').readline().strip(), False
+ errors='replace')
+ return f.readline().strip(), False
except EnvironmentError:
return "x-" + os.path.basename(repo_path), True
+ finally:
+ if f is not None:
+ f.close()
def info_string(self):
"""