summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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):
177 logfile = d.getVar('QA_LOGFILE', True) 177 logfile = d.getVar('QA_LOGFILE', True)
178 if logfile: 178 if logfile:
179 p = d.getVar('P', True) 179 p = d.getVar('P', True)
180 f = file( logfile, "a+") 180 with open(logfile, "a+") as f:
181 print >> f, "%s: %s [%s]" % (p, error, type) 181 f.write("%s: %s [%s]" % (p, error, type))
182 f.close()
183 182
184def package_qa_handle_error(error_class, error_msg, d): 183def package_qa_handle_error(error_class, error_msg, d):
185 package_qa_write_error(error_class, error_msg, d) 184 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:
43 if not os.path.isfile(self.name): 43 if not os.path.isfile(self.name):
44 raise NotELFFileError("%s is not a normal file" % self.name) 44 raise NotELFFileError("%s is not a normal file" % self.name)
45 45
46 self.file = file(self.name, "r") 46 with open(self.name, "rb") as f:
47 # Read 4k which should cover most of the headers we're after 47 # Read 4k which should cover most of the headers we're after
48 self.data = self.file.read(4096) 48 self.data = f.read(4096)
49 49
50 if len(self.data) < ELFFile.EI_NIDENT + 4: 50 if len(self.data) < ELFFile.EI_NIDENT + 4:
51 raise NotELFFileError("%s is not an ELF" % self.name) 51 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):
55 for d in self.DIRS: 55 for d in self.DIRS:
56 os.mkdir(os.path.join(self.root, d)) 56 os.mkdir(os.path.join(self.root, d))
57 for f in self.FILES: 57 for f in self.FILES:
58 file(os.path.join(self.root, f), "w") 58 open(os.path.join(self.root, f), "w")
59 for l in self.LINKS: 59 for l in self.LINKS:
60 os.symlink(l[1], os.path.join(self.root, l[0])) 60 os.symlink(l[1], os.path.join(self.root, l[0]))
61 61
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 () {
18 18
19python do_install_config () { 19python do_install_config () {
20 indir = os.path.dirname(d.getVar('FILE',1)) 20 indir = os.path.dirname(d.getVar('FILE',1))
21 infile = file(oe.path.join(indir, 'files', 'apt.conf'), 'r') 21 infile = open(oe.path.join(indir, 'files', 'apt.conf'), 'r')
22 data = infile.read() 22 data = infile.read()
23 infile.close() 23 infile.close()
24 24
@@ -30,7 +30,7 @@ python do_install_config () {
30 30
31 outpath = oe.path.join(outdir, 'apt.conf.sample') 31 outpath = oe.path.join(outdir, 'apt.conf.sample')
32 if not os.path.exists(outpath): 32 if not os.path.exists(outpath):
33 outfile = file(outpath, 'w') 33 outfile = open(outpath, 'w')
34 outfile.write(data) 34 outfile.write(data)
35 outfile.close() 35 outfile.close()
36} 36}
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__":
153 os.unlink(sys.argv[1]) 153 os.unlink(sys.argv[1])
154 except Exception: 154 except Exception:
155 sys.exc_clear() 155 sys.exc_clear()
156 outfile = file( sys.argv[1], "w" ) 156 outfile = open( sys.argv[1], "w" )
157 else: 157 else:
158 outfile = sys.stdout 158 outfile = sys.stdout
159 159
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__":
156 os.unlink(sys.argv[1]) 156 os.unlink(sys.argv[1])
157 except Exception: 157 except Exception:
158 sys.exc_clear() 158 sys.exc_clear()
159 outfile = file( sys.argv[1], "w" ) 159 outfile = open( sys.argv[1], "w" )
160 else: 160 else:
161 outfile = sys.stdout 161 outfile = sys.stdout
162 162
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:
16 sys.exit() 16 sys.exit()
17 17
18 18
19si = file(os.devnull, 'r') 19si = open(os.devnull, 'r')
20so = file(sys.argv[2], 'w') 20so = open(sys.argv[2], 'w')
21se = so 21se = so
22 22
23# Replace those fds with our own 23# Replace those fds with our own