diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-20 11:53:11 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-02 08:24:00 +0100 |
commit | 44e9a0d2fa759dea281fc32b602cd7878000c277 (patch) | |
tree | 69f6944e4bf34e2309ae8b3cc11eac13afcdf675 /meta/lib/oe/utils.py | |
parent | 8587bce564f715e46e7317218b5c190813d3a939 (diff) | |
download | poky-44e9a0d2fa759dea281fc32b602cd7878000c277.tar.gz |
classes/lib: Update to explictly create lists where needed
Iterators now return views, not lists in python3. Where we need
lists, handle this explicitly.
(From OE-Core rev: caebd862bac7eed725e0f0321bf50793671b5312)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/utils.py')
-rw-r--r-- | meta/lib/oe/utils.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index 32d61794ee..1bbdbb4bd5 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py | |||
@@ -85,11 +85,11 @@ def prune_suffix(var, suffixes, d): | |||
85 | 85 | ||
86 | def str_filter(f, str, d): | 86 | def str_filter(f, str, d): |
87 | from re import match | 87 | from re import match |
88 | return " ".join(filter(lambda x: match(f, x, 0), str.split())) | 88 | return " ".join([x for x in str.split() if match(f, x, 0)]) |
89 | 89 | ||
90 | def str_filter_out(f, str, d): | 90 | def str_filter_out(f, str, d): |
91 | from re import match | 91 | from re import match |
92 | return " ".join(filter(lambda x: not match(f, x, 0), str.split())) | 92 | return " ".join([x for x in str.split() if not match(f, x, 0)]) |
93 | 93 | ||
94 | def param_bool(cfg, field, dflt = None): | 94 | def param_bool(cfg, field, dflt = None): |
95 | """Lookup <field> in <cfg> map and convert it to a boolean; take | 95 | """Lookup <field> in <cfg> map and convert it to a boolean; take |
@@ -134,7 +134,7 @@ def packages_filter_out_system(d): | |||
134 | PN-dbg PN-doc PN-locale-eb-gb removed. | 134 | PN-dbg PN-doc PN-locale-eb-gb removed. |
135 | """ | 135 | """ |
136 | pn = d.getVar('PN', True) | 136 | pn = d.getVar('PN', True) |
137 | blacklist = map(lambda suffix: pn + suffix, ('', '-dbg', '-dev', '-doc', '-locale', '-staticdev')) | 137 | blacklist = [pn + suffix for suffix in ('', '-dbg', '-dev', '-doc', '-locale', '-staticdev')] |
138 | localepkg = pn + "-locale-" | 138 | localepkg = pn + "-locale-" |
139 | pkgs = [] | 139 | pkgs = [] |
140 | 140 | ||