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/build.py | |
parent | 7f2bf08280f11daa002f4a9e870c2b77711cbf90 (diff) | |
download | openembedded-core-contrib-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/build.py')
-rw-r--r-- | bitbake/lib/bb/build.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index d91ff53fcf..b5681b13e3 100644 --- a/bitbake/lib/bb/build.py +++ b/bitbake/lib/bb/build.py @@ -275,7 +275,8 @@ def exec_func_shell(func, d, runfile, cwd=None): bb.debug(2, "Executing shell function %s" % func) try: - bb.process.run(cmd, shell=False, stdin=NULL, log=logfile) + with open(os.devnull, 'r+') as stdin: + bb.process.run(cmd, shell=False, stdin=stdin, log=logfile) except bb.process.CmdError: logfn = d.getVar('BB_LOGFILE', True) raise FuncFailed(func, logfn) @@ -319,12 +320,11 @@ def _exec_task(fn, task, d, quieterr): # Document the order of the tasks... logorder = os.path.join(tempdir, 'log.task_order') try: - logorderfile = file(logorder, 'a') + with open(logorder, 'a') as logorderfile: + logorderfile.write('{0} ({1}): {2}\n'.format(task, os.getpid(), logbase)) except OSError: logger.exception("Opening log file '%s'", logorder) pass - logorderfile.write('{0} ({1}): {2}\n'.format(task, os.getpid(), logbase)) - logorderfile.close() # Setup the courtesy link to the logfn loglink = os.path.join(tempdir, 'log.{0}'.format(task)) @@ -348,10 +348,10 @@ def _exec_task(fn, task, d, quieterr): self.triggered = True # Handle logfiles - si = file('/dev/null', 'r') + si = open('/dev/null', 'r') try: bb.utils.mkdirhier(os.path.dirname(logfn)) - logfile = file(logfn, 'w') + logfile = open(logfn, 'w') except OSError: logger.exception("Opening log file '%s'", logfn) pass @@ -533,8 +533,7 @@ def make_stamp(task, d, file_name = None): # change on broken NFS filesystems if stamp: bb.utils.remove(stamp) - f = open(stamp, "w") - f.close() + open(stamp, "w").close() # If we're in task context, write out a signature file for each task # as it completes |