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>

diff --git a/contrib/dump_cache.py b/contrib/dump_cache.py
index e1f23090b995edbb487329e36e0ca15cd20771e8..97c5463a09265b12012cb145de282e90996d72cc 100755 (executable)
--- 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 af5b9fbc6262e1741761bf56219061c48d62e765..742fe55cfe0bb62388409e6e666507458bfe3700 100644 (file)
--- 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]