meta/scripts: python3: rename file -> open
file() API doesn't exist in python 3, convert to open(). Also handle some cases where files aren't closed. Compatible with python 2.7. [Contributions from Ed and Richard] (From OE-Core rev: 0f4ec13e11bb8abe21aba2a28547dfb9372bc377) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
ffe9604be2
commit
88972114a6
|
@ -177,9 +177,8 @@ def package_qa_write_error(type, error, d):
|
|||
logfile = d.getVar('QA_LOGFILE', True)
|
||||
if logfile:
|
||||
p = d.getVar('P', True)
|
||||
f = file( logfile, "a+")
|
||||
print >> f, "%s: %s [%s]" % (p, error, type)
|
||||
f.close()
|
||||
with open(logfile, "a+") as f:
|
||||
f.write("%s: %s [%s]" % (p, error, type))
|
||||
|
||||
def package_qa_handle_error(error_class, error_msg, d):
|
||||
package_qa_write_error(error_class, error_msg, d)
|
||||
|
|
|
@ -43,9 +43,9 @@ class ELFFile:
|
|||
if not os.path.isfile(self.name):
|
||||
raise NotELFFileError("%s is not a normal file" % self.name)
|
||||
|
||||
self.file = file(self.name, "r")
|
||||
# Read 4k which should cover most of the headers we're after
|
||||
self.data = self.file.read(4096)
|
||||
with open(self.name, "rb") as f:
|
||||
# Read 4k which should cover most of the headers we're after
|
||||
self.data = f.read(4096)
|
||||
|
||||
if len(self.data) < ELFFile.EI_NIDENT + 4:
|
||||
raise NotELFFileError("%s is not an ELF" % self.name)
|
||||
|
|
|
@ -55,7 +55,7 @@ class TestRealPath(unittest.TestCase):
|
|||
for d in self.DIRS:
|
||||
os.mkdir(os.path.join(self.root, d))
|
||||
for f in self.FILES:
|
||||
file(os.path.join(self.root, f), "w")
|
||||
open(os.path.join(self.root, f), "w")
|
||||
for l in self.LINKS:
|
||||
os.symlink(l[1], os.path.join(self.root, l[0]))
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ python do_install () {
|
|||
|
||||
python do_install_config () {
|
||||
indir = os.path.dirname(d.getVar('FILE',1))
|
||||
infile = file(oe.path.join(indir, 'files', 'apt.conf'), 'r')
|
||||
infile = open(oe.path.join(indir, 'files', 'apt.conf'), 'r')
|
||||
data = infile.read()
|
||||
infile.close()
|
||||
|
||||
|
@ -30,7 +30,7 @@ python do_install_config () {
|
|||
|
||||
outpath = oe.path.join(outdir, 'apt.conf.sample')
|
||||
if not os.path.exists(outpath):
|
||||
outfile = file(outpath, 'w')
|
||||
outfile = open(outpath, 'w')
|
||||
outfile.write(data)
|
||||
outfile.close()
|
||||
}
|
||||
|
|
|
@ -153,7 +153,7 @@ if __name__ == "__main__":
|
|||
os.unlink(sys.argv[1])
|
||||
except Exception:
|
||||
sys.exc_clear()
|
||||
outfile = file( sys.argv[1], "w" )
|
||||
outfile = open( sys.argv[1], "w" )
|
||||
else:
|
||||
outfile = sys.stdout
|
||||
|
||||
|
|
|
@ -156,7 +156,7 @@ if __name__ == "__main__":
|
|||
os.unlink(sys.argv[1])
|
||||
except Exception:
|
||||
sys.exc_clear()
|
||||
outfile = file( sys.argv[1], "w" )
|
||||
outfile = open( sys.argv[1], "w" )
|
||||
else:
|
||||
outfile = sys.stdout
|
||||
|
||||
|
|
|
@ -16,8 +16,8 @@ else:
|
|||
sys.exit()
|
||||
|
||||
|
||||
si = file(os.devnull, 'r')
|
||||
so = file(sys.argv[2], 'w')
|
||||
si = open(os.devnull, 'r')
|
||||
so = open(sys.argv[2], 'w')
|
||||
se = so
|
||||
|
||||
# Replace those fds with our own
|
||||
|
|
Loading…
Reference in New Issue