diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-09 17:05:58 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-09 22:28:04 +0100 |
| commit | 566628d8cd674a964d5824391cfd1585a1a22a87 (patch) | |
| tree | 670366ee1492ff8bb18b9261dfab9d06c06b0a2d /meta/lib/oe/utils.py | |
| parent | d2ef952851d9ef16875fdbbbc6ae6eb6cfc10cc0 (diff) | |
| download | ast2050-yocto-poky-566628d8cd674a964d5824391cfd1585a1a22a87.zip ast2050-yocto-poky-566628d8cd674a964d5824391cfd1585a1a22a87.tar.gz | |
class/lib: Fix up various file access methods
There are various bits of cruft that have built up around our file accesses. This patch
cleans some of them up, specifically:
* Remove pointless "from __builtin__ import file"
* Use open(), not file()
* Wrap file usage in a with container to ensure files are closed
* Add missing .close() calls in some cases
(From OE-Core rev: a43e0a8ecd0441131e929daf998c3cd454d9c8f3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/utils.py')
| -rw-r--r-- | meta/lib/oe/utils.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index ec8260d..0a2092b 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -7,11 +7,13 @@ except ImportError: def read_file(filename): try: - f = file( filename, "r" ) + f = open( filename, "r" ) except IOError as reason: return "" # WARNING: can't raise an error now because of the new RDEPENDS handling. This is a bit ugly. :M: else: - return f.read().strip() + data = f.read().strip() + f.close() + return data return None def ifelse(condition, iftrue = True, iffalse = False): |
