summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-21 12:26:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-21 22:26:25 +0100
commit0f4ec13e11bb8abe21aba2a28547dfb9372bc377 (patch)
treecb30f193e8193ab93bf520ffdccce4ab6b94198e
parentced1995694c394d92cb82fb9c25a33dc027a3b69 (diff)
downloadopenembedded-core-contrib-0f4ec13e11bb8abe21aba2a28547dfb9372bc377.tar.gz
openembedded-core-contrib-0f4ec13e11bb8abe21aba2a28547dfb9372bc377.tar.bz2
openembedded-core-contrib-0f4ec13e11bb8abe21aba2a28547dfb9372bc377.zip
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] Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/insane.bbclass5
-rw-r--r--meta/lib/oe/qa.py6
-rw-r--r--meta/lib/oe/tests/test_path.py2
-rw-r--r--meta/recipes-devtools/apt/apt-native.inc4
-rwxr-xr-xscripts/contrib/python/generate-manifest-2.7.py2
-rwxr-xr-xscripts/contrib/python/generate-manifest-3.5.py2
-rwxr-xr-xscripts/swabber-strace-attach4
7 files changed, 12 insertions, 13 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 0b151c214d..116abc428b 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -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)
diff --git a/meta/lib/oe/qa.py b/meta/lib/oe/qa.py
index cc2902f4af..2c301419b0 100644
--- a/meta/lib/oe/qa.py
+++ b/meta/lib/oe/qa.py
@@ -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)
diff --git a/meta/lib/oe/tests/test_path.py b/meta/lib/oe/tests/test_path.py
index 3d41ce157a..5fa24483d1 100644
--- a/meta/lib/oe/tests/test_path.py
+++ b/meta/lib/oe/tests/test_path.py
@@ -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]))
diff --git a/meta/recipes-devtools/apt/apt-native.inc b/meta/recipes-devtools/apt/apt-native.inc
index 27cc9ff0b5..59aa04e119 100644
--- a/meta/recipes-devtools/apt/apt-native.inc
+++ b/meta/recipes-devtools/apt/apt-native.inc
@@ -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()
}
diff --git a/scripts/contrib/python/generate-manifest-2.7.py b/scripts/contrib/python/generate-manifest-2.7.py
index d93c943c61..48be3a6d74 100755
--- a/scripts/contrib/python/generate-manifest-2.7.py
+++ b/scripts/contrib/python/generate-manifest-2.7.py
@@ -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
diff --git a/scripts/contrib/python/generate-manifest-3.5.py b/scripts/contrib/python/generate-manifest-3.5.py
index 367b4b8b4b..a7b38d202a 100755
--- a/scripts/contrib/python/generate-manifest-3.5.py
+++ b/scripts/contrib/python/generate-manifest-3.5.py
@@ -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
diff --git a/scripts/swabber-strace-attach b/scripts/swabber-strace-attach
index bb0391a7ca..f258987d5e 100755
--- a/scripts/swabber-strace-attach
+++ b/scripts/swabber-strace-attach
@@ -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