diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-12 08:30:35 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-16 23:32:40 +0100 |
commit | bc8971d122a02ed823acf0758da267dccc584f98 (patch) | |
tree | dd97329507feb611e64fad7f46d97d657f23eae4 /bitbake/lib/bb/fetch2/npm.py | |
parent | e2f4d9f1ec694768b223decb59a9c768a2da962d (diff) | |
download | poky-bc8971d122a02ed823acf0758da267dccc584f98.tar.gz |
bitbake: bitbake: Convert to python 3 megacommit This needs breaking up into smaller changes.
(Bitbake rev: cf51f19aed208a75d38c14cd585d9b9f115e3ba3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2/npm.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/npm.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/fetch2/npm.py b/bitbake/lib/bb/fetch2/npm.py index d9e46b2e8c..2fd43034ba 100644 --- a/bitbake/lib/bb/fetch2/npm.py +++ b/bitbake/lib/bb/fetch2/npm.py | |||
@@ -20,7 +20,7 @@ Usage in the recipe: | |||
20 | 20 | ||
21 | import os | 21 | import os |
22 | import sys | 22 | import sys |
23 | import urllib | 23 | import urllib.request, urllib.parse, urllib.error |
24 | import json | 24 | import json |
25 | import subprocess | 25 | import subprocess |
26 | import signal | 26 | import signal |
@@ -196,9 +196,9 @@ class Npm(FetchMethod): | |||
196 | optdepsfound[dep] = dependencies[dep] | 196 | optdepsfound[dep] = dependencies[dep] |
197 | else: | 197 | else: |
198 | depsfound[dep] = dependencies[dep] | 198 | depsfound[dep] = dependencies[dep] |
199 | for dep, version in optdepsfound.iteritems(): | 199 | for dep, version in optdepsfound.items(): |
200 | self._getdependencies(dep, data[pkg]['deps'], version, d, ud, optional=True) | 200 | self._getdependencies(dep, data[pkg]['deps'], version, d, ud, optional=True) |
201 | for dep, version in depsfound.iteritems(): | 201 | for dep, version in depsfound.items(): |
202 | self._getdependencies(dep, data[pkg]['deps'], version, d, ud) | 202 | self._getdependencies(dep, data[pkg]['deps'], version, d, ud) |
203 | 203 | ||
204 | def _getshrinkeddependencies(self, pkg, data, version, d, ud, lockdown, manifest): | 204 | def _getshrinkeddependencies(self, pkg, data, version, d, ud, lockdown, manifest): |