From: Arfrever Frehtes Taifersar Arahesis Date: Sun, 28 Aug 2011 19:54:23 +0000 (+0200) Subject: Fix "ResourceWarning: unclosed file" with Python 3.2. X-Git-Tag: v2.2.0_alpha52~47 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4afee825db23000b28a226b7b488956d4eb8f708;p=portage.git Fix "ResourceWarning: unclosed file" with Python 3.2. --- diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index aa9218c69..47b4ec400 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -1692,14 +1692,17 @@ def _post_src_install_soname_symlinks(mysettings, out): "build-info", "NEEDED.ELF.2") try: - lines = io.open(_unicode_encode(needed_filename, + f = io.open(_unicode_encode(needed_filename, encoding=_encodings['fs'], errors='strict'), mode='r', encoding=_encodings['repo.content'], - errors='replace').readlines() + errors='replace') + lines = f.readlines() except IOError as e: if e.errno not in (errno.ENOENT, errno.ESTALE): raise return + finally: + f.close() libpaths = set(portage.util.getlibpaths( mysettings["ROOT"], env=mysettings))