From df1546952bf13ba9fb811daf1472caadfa03eb38 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 11 May 2016 22:56:29 +0100 Subject: bitbake: contrib/dump_cache.py, cache: Fix to use python 3 syntax Some tweaks to use python 3 syntax in a python 2 compatible way. (Bitbake rev: 322949c77dbaa4db01b5a43d85b39a2af67ba7b2) Signed-off-by: Richard Purdie --- bitbake/contrib/dump_cache.py | 4 ++-- bitbake/lib/bb/cache.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bitbake/contrib/dump_cache.py b/bitbake/contrib/dump_cache.py index e1f23090b9..97c5463a09 100755 --- a/bitbake/contrib/dump_cache.py +++ b/bitbake/contrib/dump_cache.py @@ -36,7 +36,7 @@ def main(argv=None): Get the mapping for the target recipe. """ if len(argv) != 1: - print >>sys.stderr, "Error, need one argument!" + print("Error, need one argument!", file=sys.stderr) return 2 cachefile = argv[0] @@ -56,7 +56,7 @@ def main(argv=None): continue # 1.0 is the default version for a no PV recipe. - if val.__dict__.has_key("pv"): + if "pv" in val.__dict__: pv = val.pv else: pv = "1.0" diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index af5b9fbc62..742fe55cfe 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py @@ -339,7 +339,7 @@ class Cache(object): value = pickled.load() except Exception: break - if self.depends_cache.has_key(key): + if key in self.depends_cache: self.depends_cache[key].append(value) else: self.depends_cache[key] = [value] -- cgit v1.2.3-54-g00ecf