From 7eab022d4b484aec40998f95835ba46c5da168cf Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 18 May 2016 21:39:44 +0300 Subject: 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 Signed-off-by: Richard Purdie --- scripts/combo-layer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/combo-layer') diff --git a/scripts/combo-layer b/scripts/combo-layer index e47059290d..52367f091d 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -1178,7 +1178,7 @@ def update_with_history(conf, components, revisions, repos): # components imported head revision. if additional_heads: runcmd("git reset --hard", **wargs) - for rev, base in additional_heads.iteritems(): + for rev, base in additional_heads.items(): apply_commit(base, rev, wargs, wargs, None) # Commit with all component branches as parents as well as the previous head. -- cgit v1.2.3-54-g00ecf