mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
scripts: Fix deprecated dict methods for python3
Replaced iteritems -> items, itervalues -> values, iterkeys -> keys or 'in' (From OE-Core rev: 25d4d8274bac696a484f83d7f3ada778cf95f4d0) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
63404baadb
commit
7eab022d4b
@@ -194,7 +194,7 @@ def patch_recipe_lines(fromlines, values, trailing_newline=True):
|
||||
remainingnames = {}
|
||||
for k in values.keys():
|
||||
remainingnames[k] = get_recipe_pos(k)
|
||||
remainingnames = OrderedDict(sorted(remainingnames.iteritems(), key=lambda x: x[1]))
|
||||
remainingnames = OrderedDict(sorted(remainingnames.items(), key=lambda x: x[1]))
|
||||
|
||||
modifying = False
|
||||
|
||||
@@ -234,7 +234,7 @@ def patch_recipe_lines(fromlines, values, trailing_newline=True):
|
||||
if modifying:
|
||||
# Insert anything that should come before this variable
|
||||
pos = get_recipe_pos(varname)
|
||||
for k in remainingnames.keys()[:]:
|
||||
for k in list(remainingnames):
|
||||
if remainingnames[k] > -1 and pos >= remainingnames[k] and not k in existingnames:
|
||||
outputvalue(k, newlines, rewindcomments=True)
|
||||
del remainingnames[k]
|
||||
|
||||
Reference in New Issue
Block a user