mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
classes/lib: Update to match python3 iter requirements
python3 standardises its use of iteration operations. Update the code to match the for python3 requires. (From OE-Core rev: 2476bdcbef591e951d11d57d53f1315848758571) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -50,7 +50,7 @@ class DevtoolBase(oeSelfTest):
|
||||
|
||||
|
||||
missingvars = {}
|
||||
for var, value in checkvars.iteritems():
|
||||
for var, value in checkvars.items():
|
||||
if value is not None:
|
||||
missingvars[var] = value
|
||||
self.assertEqual(missingvars, {}, 'Some expected variables not found in recipe: %s' % checkvars)
|
||||
|
||||
@@ -445,14 +445,14 @@ http_proxy = "http://example.com/"
|
||||
files1 = get_files(topdir + "/tmp-sstatesamehash/stamps/")
|
||||
files2 = get_files(topdir + "/tmp-sstatesamehash2/stamps/")
|
||||
# Remove items that are identical in both sets
|
||||
for k,v in files1.viewitems() & files2.viewitems():
|
||||
for k,v in files1.items() & files2.items():
|
||||
del files1[k]
|
||||
del files2[k]
|
||||
if not files1 and not files2:
|
||||
# No changes, so we're done
|
||||
return
|
||||
|
||||
for k in files1.viewkeys() | files2.viewkeys():
|
||||
for k in files1.keys() | files2.keys():
|
||||
if k in files1 and k in files2:
|
||||
print("%s differs:" % k)
|
||||
print(subprocess.check_output(("bitbake-diffsigs",
|
||||
|
||||
@@ -215,7 +215,7 @@ def tag(*args, **kwargs):
|
||||
def wrap_ob(ob):
|
||||
for name in args:
|
||||
setattr(ob, __tag_prefix + name, True)
|
||||
for name, value in kwargs.iteritems():
|
||||
for name, value in kwargs.items():
|
||||
setattr(ob, __tag_prefix + name, value)
|
||||
return ob
|
||||
return wrap_ob
|
||||
|
||||
Reference in New Issue
Block a user