aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-11 22:56:29 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-12 08:21:12 +0100
commit322949c77dbaa4db01b5a43d85b39a2af67ba7b2 (patch)
treece1a87b3a21c3608fdf7819b38dd7b04a2257292
parent624dd92952b2fc736fd86abe5f2390b87b3a7dd3 (diff)
downloadbitbake-322949c77dbaa4db01b5a43d85b39a2af67ba7b2.tar.gz
bitbake-322949c77dbaa4db01b5a43d85b39a2af67ba7b2.tar.bz2
bitbake-322949c77dbaa4db01b5a43d85b39a2af67ba7b2.zip
contrib/dump_cache.py, cache: Fix to use python 3 syntax
Some tweaks to use python 3 syntax in a python 2 compatible way. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xcontrib/dump_cache.py4
-rw-r--r--lib/bb/cache.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/dump_cache.py b/contrib/dump_cache.py
index e1f23090b..97c5463a0 100755
--- a/contrib/dump_cache.py
+++ b/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/lib/bb/cache.py b/lib/bb/cache.py
index af5b9fbc6..742fe55cf 100644
--- a/lib/bb/cache.py
+++ b/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]