Commit d4bc27bd authored by Wojciech Bielawski's avatar Wojciech Bielawski Committed by Chromium LUCI CQ

Use list to wrap python3 generator objects.

Python3 map, filter returns generator object. In some places generators
must be wrapped with list to allow reuse of result. In other to allow
concatenation.

Bug: 1164344
Change-Id: I00813ff95c73f3e25f18d7bab08e2704af948664
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2617846Reviewed-by: default avatarHitoshi Yoshida <peria@chromium.org>
Reviewed-by: default avatarYuki Shiino <yukishiino@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843455}
parent a66324ba
...@@ -428,7 +428,8 @@ already present in the provided output root.""") ...@@ -428,7 +428,8 @@ already present in the provided output root.""")
else: else:
allowed_imports = None allowed_imports = None
module_metadata = map(lambda kvp: tuple(kvp.split('=')), args.module_metadata) module_metadata = list(
map(lambda kvp: tuple(kvp.split('=')), args.module_metadata))
_ParseMojoms(mojom_files, input_roots, output_root, args.enabled_features, _ParseMojoms(mojom_files, input_roots, output_root, args.enabled_features,
module_metadata, allowed_imports) module_metadata, allowed_imports)
logging.info('Finished') logging.info('Finished')
......
...@@ -592,8 +592,9 @@ def generate_callback_function(callback_function_identifier): ...@@ -592,8 +592,9 @@ def generate_callback_function(callback_function_identifier):
]) ])
(header_forward_decls, header_include_headers, source_forward_decls, (header_forward_decls, header_include_headers, source_forward_decls,
source_include_headers) = collect_forward_decls_and_include_headers( source_include_headers) = collect_forward_decls_and_include_headers(
[callback_function.return_type] + [callback_function.return_type] + list(
map(lambda argument: argument.idl_type, callback_function.arguments)) map(lambda argument: argument.idl_type,
callback_function.arguments)))
header_node.accumulator.add_class_decls(header_forward_decls) header_node.accumulator.add_class_decls(header_forward_decls)
header_node.accumulator.add_include_headers(header_include_headers) header_node.accumulator.add_include_headers(header_include_headers)
source_node.accumulator.add_class_decls(source_forward_decls) source_node.accumulator.add_class_decls(source_forward_decls)
......
...@@ -289,9 +289,9 @@ def generate_callback_interface(callback_interface_identifier): ...@@ -289,9 +289,9 @@ def generate_callback_interface(callback_interface_identifier):
]) ])
(header_forward_decls, header_include_headers, source_forward_decls, (header_forward_decls, header_include_headers, source_forward_decls,
source_include_headers) = collect_forward_decls_and_include_headers( source_include_headers) = collect_forward_decls_and_include_headers(
[callback_interface.operation_groups[0][0].return_type] + [callback_interface.operation_groups[0][0].return_type] + list(
map(lambda argument: argument.idl_type, map(lambda argument: argument.idl_type,
callback_interface.operation_groups[0][0].arguments)) callback_interface.operation_groups[0][0].arguments)))
header_node.accumulator.add_class_decls(header_forward_decls) header_node.accumulator.add_class_decls(header_forward_decls)
header_node.accumulator.add_include_headers(header_include_headers) header_node.accumulator.add_include_headers(header_include_headers)
source_node.accumulator.add_class_decls(source_forward_decls) source_node.accumulator.add_class_decls(source_forward_decls)
......
...@@ -5184,9 +5184,9 @@ def make_install_interface_template(cg_context, function_name, class_name, ...@@ -5184,9 +5184,9 @@ def make_install_interface_template(cg_context, function_name, class_name,
]) ])
if class_like.identifier == "CSSStyleDeclaration": if class_like.identifier == "CSSStyleDeclaration":
css_properties = filter( css_properties = list(
lambda attr: "CSSProperty" in attr.extended_attributes, filter(lambda attr: "CSSProperty" in attr.extended_attributes,
class_like.attributes) class_like.attributes))
if css_properties: if css_properties:
prop_name_list = "".join( prop_name_list = "".join(
map(lambda attr: "\"{}\", ".format(attr.identifier), map(lambda attr: "\"{}\", ".format(attr.identifier),
...@@ -5625,12 +5625,14 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As<v8::Object>();\ ...@@ -5625,12 +5625,14 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As<v8::Object>();\
pattern, pattern,
install_func="IDLMemberInstaller::InstallOperations", install_func="IDLMemberInstaller::InstallOperations",
table_name=table_name) table_name=table_name)
entries = filter(lambda entry: not entry.no_alloc_direct_callback_name, entries = list(
operation_entries) filter(lambda entry: not entry.no_alloc_direct_callback_name,
operation_entries))
install_properties(table_name, entries, _make_operation_registration_table, install_properties(table_name, entries, _make_operation_registration_table,
installer_call_text) installer_call_text)
entries = filter(lambda entry: entry.no_alloc_direct_callback_name, entries = list(
operation_entries) filter(lambda entry: entry.no_alloc_direct_callback_name,
operation_entries))
install_properties(table_name, entries, _make_operation_registration_table, install_properties(table_name, entries, _make_operation_registration_table,
installer_call_text) installer_call_text)
......
...@@ -48,9 +48,10 @@ def ReadFilteredData(path): ...@@ -48,9 +48,10 @@ def ReadFilteredData(path):
data = ukm_model.UKM_XML_TYPE.Parse(ukm_file.read()) data = ukm_model.UKM_XML_TYPE.Parse(ukm_file.read())
event_tag = ukm_model._EVENT_TYPE.tag event_tag = ukm_model._EVENT_TYPE.tag
metric_tag = ukm_model._METRIC_TYPE.tag metric_tag = ukm_model._METRIC_TYPE.tag
data[event_tag] = filter(ukm_model.IsNotObsolete, data[event_tag]) data[event_tag] = list(filter(ukm_model.IsNotObsolete, data[event_tag]))
for event in data[event_tag]: for event in data[event_tag]:
event[metric_tag] = filter(ukm_model.IsNotObsolete, event[metric_tag]) event[metric_tag] = list(
filter(ukm_model.IsNotObsolete, event[metric_tag]))
return data return data
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment