diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-06-02 13:12:47 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-03 13:13:28 +0100 |
commit | 07c97db27288cf806900b13e55fe37e4bf22e889 (patch) | |
tree | bf116c101f365c8dc438b72aa9499feabea2ef66 /scripts/lib/devtool | |
parent | 1132970f0e1a9e9a2135549b8512f58af80aa5c4 (diff) | |
download | poky-07c97db27288cf806900b13e55fe37e4bf22e889.tar.gz |
scripts: python3: convert iterables to lists
Converted return value of items() keys() and values() to
lists when dictionary is modified in the loop and when
the result is added to the list.
(From OE-Core rev: 874a269eb1d70060c2f3b3f8b70800e2aea789f4)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool')
-rw-r--r-- | scripts/lib/devtool/build.py | 2 | ||||
-rw-r--r-- | scripts/lib/devtool/standard.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/devtool/build.py b/scripts/lib/devtool/build.py index 48f6fe1be5..6be549dd59 100644 --- a/scripts/lib/devtool/build.py +++ b/scripts/lib/devtool/build.py | |||
@@ -27,7 +27,7 @@ logger = logging.getLogger('devtool') | |||
27 | 27 | ||
28 | 28 | ||
29 | def _set_file_values(fn, values): | 29 | def _set_file_values(fn, values): |
30 | remaining = values.keys() | 30 | remaining = list(values.keys()) |
31 | 31 | ||
32 | def varfunc(varname, origvalue, op, newlines): | 32 | def varfunc(varname, origvalue, op, newlines): |
33 | newvalue = values.get(varname, origvalue) | 33 | newvalue = values.get(varname, origvalue) |
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 08153c6edc..a2516d66ac 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -998,7 +998,7 @@ def _export_local_files(srctree, rd, destdir): | |||
998 | bb.process.run(['git', 'checkout', tree, '--', '.'], cwd=srctree, | 998 | bb.process.run(['git', 'checkout', tree, '--', '.'], cwd=srctree, |
999 | env=dict(os.environ, GIT_WORK_TREE=destdir, | 999 | env=dict(os.environ, GIT_WORK_TREE=destdir, |
1000 | GIT_INDEX_FILE=tmp_index)) | 1000 | GIT_INDEX_FILE=tmp_index)) |
1001 | new_set = _git_ls_tree(srctree, tree, True).keys() | 1001 | new_set = list(_git_ls_tree(srctree, tree, True).keys()) |
1002 | elif os.path.isdir(local_files_dir): | 1002 | elif os.path.isdir(local_files_dir): |
1003 | # If not tracked by Git, just copy from working copy | 1003 | # If not tracked by Git, just copy from working copy |
1004 | new_set = _ls_tree(os.path.join(srctree, 'oe-local-files')) | 1004 | new_set = _ls_tree(os.path.join(srctree, 'oe-local-files')) |
@@ -1309,7 +1309,7 @@ def reset(args, config, basepath, workspace): | |||
1309 | raise DevtoolError("Recipe must be specified, or specify -a/--all to " | 1309 | raise DevtoolError("Recipe must be specified, or specify -a/--all to " |
1310 | "reset all recipes") | 1310 | "reset all recipes") |
1311 | if args.all: | 1311 | if args.all: |
1312 | recipes = workspace.keys() | 1312 | recipes = list(workspace.keys()) |
1313 | else: | 1313 | else: |
1314 | recipes = [args.recipename] | 1314 | recipes = [args.recipename] |
1315 | 1315 | ||