diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-21 12:26:45 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-21 22:26:25 +0100 |
| commit | 0f4ec13e11bb8abe21aba2a28547dfb9372bc377 (patch) | |
| tree | cb30f193e8193ab93bf520ffdccce4ab6b94198e /meta/lib | |
| parent | ced1995694c394d92cb82fb9c25a33dc027a3b69 (diff) | |
| download | openembedded-core-contrib-0f4ec13e11bb8abe21aba2a28547dfb9372bc377.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]
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oe/qa.py | 6 | ||||
| -rw-r--r-- | meta/lib/oe/tests/test_path.py | 2 |
2 files changed, 4 insertions, 4 deletions
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])) |