From c334dbe1e9e64fcb60d7a2721f4288be778c9793 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 22 Sep 2006 21:49:22 +0000 Subject: [PATCH] Use finally: to ensure that the file is closed properly. svn path=/main/trunk/; revision=4504 --- pym/cache/flat_hash.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pym/cache/flat_hash.py b/pym/cache/flat_hash.py index db46b0878..90c785f34 100644 --- a/pym/cache/flat_hash.py +++ b/pym/cache/flat_hash.py @@ -22,16 +22,17 @@ class database(fs_template.FsBased): def __getitem__(self, cpv): fp = os.path.join(self.location, cpv) - myf = None try: - myf = open(fp,"r") - d = self._parse_data(myf, cpv) - d["_mtime_"] = long(os.fstat(myf.fileno()).st_mtime) - myf.close() - return d + myf = None + try: + myf = open(fp,"r") + d = self._parse_data(myf, cpv) + d["_mtime_"] = long(os.fstat(myf.fileno()).st_mtime) + return d + finally: + if myf: + myf.close() except (IOError, OSError), e: - if myf: - myf.close() if e.errno != errno.ENOENT: raise cache_errors.CacheCorruption(cpv, e) raise KeyError(cpv) -- 2.26.2