summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
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:33 +0100
commit88972114a6f539b76e37e055735aaa8eb62d0609 (patch)
tree3196dd2600fa169f80e054321fcd21746ce6feb2 /meta/recipes-devtools
parentffe9604be2556b8b5c3f98bcc5283b00bf0c0dab (diff)
downloadpoky-88972114a6f539b76e37e055735aaa8eb62d0609.tar.gz
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>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/apt/apt-native.inc4
1 files changed, 2 insertions, 2 deletions
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}