diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-12 08:30:35 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-02 08:24:02 +0100 |
commit | 0f2c59367a649de5f57acdccfb4f1fdba9cde730 (patch) | |
tree | 7a3558a3e08e690fbb0b5bdc4044316f9ab4bbcb /bitbake/lib/bb/fetch2/npm.py | |
parent | ef1df516512587ad415f76a9626620992d660e45 (diff) | |
download | poky-0f2c59367a649de5f57acdccfb4f1fdba9cde730.tar.gz |
bitbake: bitbake: Convert to python 3
Various misc changes to convert bitbake to python3 which don't warrant
separation into separate commits.
(Bitbake rev: d0f904d407f57998419bd9c305ce53e5eaa36b24)
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): |