diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-08-24 19:25:59 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-08-24 19:25:59 -0700 |
| commit | a12c63842b28e29f3bc6718e6d940d5b697f010f (patch) | |
| tree | cb1e1f4a102a369591dc70355987e8c81e7c2f4d /pym/portage/package | |
| parent | ElementTree: use iter if available (bug #380565) (diff) | |
| download | portage-a12c63842b28e29f3bc6718e6d940d5b697f010f.tar.gz portage-a12c63842b28e29f3bc6718e6d940d5b697f010f.tar.bz2 portage-a12c63842b28e29f3bc6718e6d940d5b697f010f.zip | |
python3.2 fixes: ResourceWarning: unclosed file
Diffstat (limited to 'pym/portage/package')
| -rw-r--r-- | pym/portage/package/ebuild/_config/LocationsManager.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym/portage/package/ebuild/_config/LocationsManager.py index c2b115bb0..4072ffcae 100644 --- a/pym/portage/package/ebuild/_config/LocationsManager.py +++ b/pym/portage/package/ebuild/_config/LocationsManager.py @@ -89,11 +89,12 @@ class LocationsManager(object): def _addProfile(self, currentPath): parentsFile = os.path.join(currentPath, "parent") eapi_file = os.path.join(currentPath, "eapi") + f = None try: - eapi = io.open(_unicode_encode(eapi_file, + f = io.open(_unicode_encode(eapi_file, encoding=_encodings['fs'], errors='strict'), - mode='r', encoding=_encodings['content'], errors='replace' - ).readline().strip() + mode='r', encoding=_encodings['content'], errors='replace') + eapi = f.readline().strip() except IOError: pass else: @@ -102,6 +103,9 @@ class LocationsManager(object): "Profile contains unsupported " "EAPI '%s': '%s'") % \ (eapi, os.path.realpath(eapi_file),)) + finally: + if f is not None: + f.close() if os.path.exists(parentsFile): parents = grabfile(parentsFile) if not parents: |