From 206b7b1c95a7624809c18db2622fe7b786765cf7 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 13 Dec 2023 18:46:06 -0500 Subject: [PATCH] Fix mojom_ts_generator.py error with Python 3.11 --- patch/patch.cfg | 5 +++++ patch/patches/mojo_generator_1422178.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 patch/patches/mojo_generator_1422178.patch diff --git a/patch/patch.cfg b/patch/patch.cfg index 52bf939c2..ddffe864a 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -706,5 +706,10 @@ patches = [ # windows: Fix implicit conversion error when building cef_sandbox. # https://chromium-review.googlesource.com/c/chromium/src/+/5120035 'name': 'base_allocator_5120035' + }, + { + # Fix mojom_ts_generator.py error with Python 3.11. + # https://bugs.chromium.org/p/chromium/issues/detail?id=1422178 + 'name': 'mojo_generator_1422178' } ] diff --git a/patch/patches/mojo_generator_1422178.patch b/patch/patches/mojo_generator_1422178.patch new file mode 100644 index 000000000..a00f5cd2c --- /dev/null +++ b/patch/patches/mojo_generator_1422178.patch @@ -0,0 +1,13 @@ +diff --git mojo/public/tools/bindings/generators/mojom_ts_generator.py mojo/public/tools/bindings/generators/mojom_ts_generator.py +index 98516f03276e4..a1bda9c021c52 100644 +--- mojo/public/tools/bindings/generators/mojom_ts_generator.py ++++ mojo/public/tools/bindings/generators/mojom_ts_generator.py +@@ -177,6 +177,8 @@ def _GetWebUiModulePath(module): + path = module.metadata.get('webui_module_path') + if path is None or path == '/': + return path ++ if path == '': ++ return '/' + if _IsAbsoluteChromeResourcesPath(path): + return path.rstrip('/') + '/' + return '/{}/'.format(path.strip('/'))