mojo: Fix map() Python 3 compatibility
map() returns a list in Python 2. Python 3 returns an iterator. Wrapping in a list() results in the same behaviour on both. Traceback (most recent call last): File "../../mojo/public/tools/bindings/mojom_bindings_generator.py", line 556, in <module> sys.exit(main()) File "../../mojo/public/tools/bindings/mojom_bindings_generator.py", line 551, in main return args.func(args, remaining_args) File "../../mojo/public/tools/bindings/mojom_bindings_generator.py", line 267, in _Generate processor._GenerateModule(args, remaining_args, generator_modules, File "../../mojo/public/tools/bindings/mojom_bindings_generator.py", line 238, in _GenerateModule generator.GenerateFiles(filtered_args) File "C:\Google\chromium\src\mojo\public\tools\bindings\generators\mojom_cpp_generator.py", line 464, in GenerateFiles self.WriteWithComment(self._GenerateModuleSharedHeader(), File "C:\Google\chromium\src\mojo\public\tools\bindings\pylib\mojom\generate\template_expander.py", line 36, in GeneratorInternal parameters = generator(*args, **kwargs2) File "C:\Google\chromium\src\mojo\public\tools\bindings\generators\mojom_cpp_generator.py", line 430, in _GenerateModuleSharedHeader return self._GetJinjaExports() File "C:\Google\chromium\src\mojo\public\tools\bindings\generators\mojom_cpp_generator.py", line 331, in _GetJinjaExports "extra_traits_headers": self._GetExtraTraitsHeaders(), File "C:\Google\chromium\src\mojo\public\tools\bindings\generators\mojom_cpp_generator.py", line 215, in _GetExtraTraitsHeaders for typemap in self._GetAllUsedTypemaps(): File "C:\Google\chromium\src\mojo\public\tools\bindings\generators\mojom_cpp_generator.py", line 262, in _GetAllUsedTypemaps for parameter in method.parameters + (method.response_parameters or []): TypeError: unsupported operand type(s) for +: 'map' and 'list' Bug: 941669 Change-Id: I129c29a1e663671c2d521155b8bb860182cfa121 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2046130 Commit-Queue: Ken Rockot <rockot@google.com> Auto-Submit: Raul Tambre <raul@tambre.ee> Reviewed-by:Ken Rockot <rockot@google.com> Cr-Commit-Position: refs/heads/master@{#740004}
Showing
Please register or sign in to comment