diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-09 21:06:45 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-09 22:28:04 +0100 |
commit | 4a081b5a52e3d27da8d4b062f3fda292e8d8fb0a (patch) | |
tree | a555b39b41e4ec36c212481fcd2887cde2ee30dd /bitbake/lib/bb/utils.py | |
parent | 7f2bf08280f11daa002f4a9e870c2b77711cbf90 (diff) | |
download | ast2050-yocto-poky-4a081b5a52e3d27da8d4b062f3fda292e8d8fb0a.zip ast2050-yocto-poky-4a081b5a52e3d27da8d4b062f3fda292e8d8fb0a.tar.gz |
bitbake: lib: Clean up various file access syntax
Python 3 is stricter about how files are accessed. Specficially:
* Use open(), not file()
* Use binary mode for binary files (when checksumming)
* Use with statements to ensure files get closed
* Add missing file close statements
(Bitbake rev: 9f08b901375ba640f47596f1bcf43f98a931550f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/utils.py')
-rw-r--r-- | bitbake/lib/bb/utils.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index 462eb68..2e10fc2 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py @@ -414,6 +414,10 @@ def lockfile(name, shared=False, retry=True): return lf lf.close() except Exception: + try: + lf.close() + except Exception: + pass pass if not retry: return None @@ -443,8 +447,9 @@ def md5_file(filename): import md5 m = md5.new() - for line in open(filename): - m.update(line) + with open(filename, "rb") as f: + for line in f: + m.update(line) return m.hexdigest() def sha256_file(filename): @@ -460,8 +465,9 @@ def sha256_file(filename): return None s = hashlib.sha256() - for line in open(filename): - s.update(line) + with open(filename, "rb") as f: + for line in f: + s.update(line) return s.hexdigest() def preserved_envvars_exported(): |