summaryrefslogtreecommitdiffstats
path: root/scripts/lib/recipetool/create_npm.py
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 /scripts/lib/recipetool/create_npm.py
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 'scripts/lib/recipetool/create_npm.py')
-rw-r--r--scripts/lib/recipetool/create_npm.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/recipetool/create_npm.py b/scripts/lib/recipetool/create_npm.py
index ffbcb4905c..fcc0172af8 100644
--- a/scripts/lib/recipetool/create_npm.py
+++ b/scripts/lib/recipetool/create_npm.py
@@ -128,7 +128,7 @@ class NpmRecipeHandler(RecipeHandler):
128 license = self._handle_license(data) 128 license = self._handle_license(data)
129 if license: 129 if license:
130 licenses['${PN}'] = license 130 licenses['${PN}'] = license
131 for pkgname, pkgitem in npmpackages.iteritems(): 131 for pkgname, pkgitem in npmpackages.items():
132 _, pdata = pkgitem 132 _, pdata = pkgitem
133 license = self._handle_license(pdata) 133 license = self._handle_license(pdata)
134 if license: 134 if license:
@@ -136,7 +136,7 @@ class NpmRecipeHandler(RecipeHandler):
136 # Now write out the package-specific license values 136 # Now write out the package-specific license values
137 # We need to strip out the json data dicts for this since split_pkg_licenses 137 # We need to strip out the json data dicts for this since split_pkg_licenses
138 # isn't expecting it 138 # isn't expecting it
139 packages = OrderedDict((x,y[0]) for x,y in npmpackages.iteritems()) 139 packages = OrderedDict((x,y[0]) for x,y in npmpackages.items())
140 packages['${PN}'] = '' 140 packages['${PN}'] = ''
141 pkglicenses = split_pkg_licenses(licvalues, packages, lines_after, licenses) 141 pkglicenses = split_pkg_licenses(licvalues, packages, lines_after, licenses)
142 all_licenses = list(set([item for pkglicense in pkglicenses.values() for item in pkglicense])) 142 all_licenses = list(set([item for pkglicense in pkglicenses.values() for item in pkglicense]))