summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-05-18 21:39:44 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-02 08:24:01 +0100
commit7eab022d4b484aec40998f95835ba46c5da168cf (patch)
treee88a3bf01eada7d44e41bfadee5721ce6ec198e0 /meta/lib
parent63404baadbfd1225bbb955f8c8f817073aef65d8 (diff)
downloadpoky-7eab022d4b484aec40998f95835ba46c5da168cf.tar.gz
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>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/recipeutils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 632184fcd9..1b8538785c 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -194,7 +194,7 @@ def patch_recipe_lines(fromlines, values, trailing_newline=True):
194 remainingnames = {} 194 remainingnames = {}
195 for k in values.keys(): 195 for k in values.keys():
196 remainingnames[k] = get_recipe_pos(k) 196 remainingnames[k] = get_recipe_pos(k)
197 remainingnames = OrderedDict(sorted(remainingnames.iteritems(), key=lambda x: x[1])) 197 remainingnames = OrderedDict(sorted(remainingnames.items(), key=lambda x: x[1]))
198 198
199 modifying = False 199 modifying = False
200 200
@@ -234,7 +234,7 @@ def patch_recipe_lines(fromlines, values, trailing_newline=True):
234 if modifying: 234 if modifying:
235 # Insert anything that should come before this variable 235 # Insert anything that should come before this variable
236 pos = get_recipe_pos(varname) 236 pos = get_recipe_pos(varname)
237 for k in remainingnames.keys()[:]: 237 for k in list(remainingnames):
238 if remainingnames[k] > -1 and pos >= remainingnames[k] and not k in existingnames: 238 if remainingnames[k] > -1 and pos >= remainingnames[k] and not k in existingnames:
239 outputvalue(k, newlines, rewindcomments=True) 239 outputvalue(k, newlines, rewindcomments=True)
240 del remainingnames[k] 240 del remainingnames[k]