diff options
author | Zac Medico <zmedico@gentoo.org> | 2011-08-26 12:53:55 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-08-26 12:53:55 -0700 |
commit | 42c96587b86ba8f551f605086e47a5cd96843a1a (patch) | |
tree | 92c843f2d647fa5976b0115e3581fdebb3dbae4d /pym/portage/dbapi/vartree.py | |
parent | 2f253bcc364bd75c9b103133a17ea9887a3de15d (diff) | |
download | portage-42c96587b86ba8f551f605086e47a5cd96843a1a.tar.gz portage-42c96587b86ba8f551f605086e47a5cd96843a1a.tar.bz2 portage-42c96587b86ba8f551f605086e47a5cd96843a1a.zip |
python3.2 fixes: ResourceWarning: unclosed file
Diffstat (limited to 'pym/portage/dbapi/vartree.py')
-rw-r--r-- | pym/portage/dbapi/vartree.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 7f7873bd4..6e49f38f8 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -3192,17 +3192,22 @@ class dblink(object): pass continue + f = None try: - val = io.open(_unicode_encode( + f = io.open(_unicode_encode( os.path.join(inforoot, var_name), encoding=_encodings['fs'], errors='strict'), mode='r', encoding=_encodings['repo.content'], - errors='replace').readline().strip() + errors='replace') + val = f.readline().strip() except EnvironmentError as e: if e.errno != errno.ENOENT: raise del e val = '' + finally: + if f is not None: + f.close() if var_name == 'SLOT': slot = val @@ -3558,10 +3563,12 @@ class dblink(object): # write local package counter for recording if counter is None: counter = self.vartree.dbapi.counter_tick(mycpv=self.mycpv) - io.open(_unicode_encode(os.path.join(self.dbtmpdir, 'COUNTER'), + f = io.open(_unicode_encode(os.path.join(self.dbtmpdir, 'COUNTER'), encoding=_encodings['fs'], errors='strict'), mode='w', encoding=_encodings['repo.content'], - errors='backslashreplace').write(_unicode_decode(str(counter))) + errors='backslashreplace') + f.write(_unicode_decode(str(counter))) + f.close() self.updateprotect() |