Unbundle assorted lexing/parsing/transpiling tools written in Python. --- a/mojo/public/tools/mojom/mojom/BUILD.gn +++ b/mojo/public/tools/mojom/mojom/BUILD.gn @@ -21,7 +21,6 @@ # Third-party module dependencies "//third_party/jinja2/", - "//third_party/ply/", ] } --- a/third_party/blink/renderer/bindings/scripts/build_web_idl_database.pydeps +++ b/third_party/blink/renderer/bindings/scripts/build_web_idl_database.pydeps @@ -2,10 +2,6 @@ # build/print_python_deps.py --root third_party/blink/renderer/bindings/scripts --output third_party/blink/renderer/bindings/scripts/build_web_idl_database.pydeps third_party/blink/renderer/bindings/scripts/build_web_idl_database.py ../../../../../tools/idl_parser/__init__.py ../../../../../tools/idl_parser/idl_node.py -../../../../pyjson5/src/json5/__init__.py -../../../../pyjson5/src/json5/lib.py -../../../../pyjson5/src/json5/parser.py -../../../../pyjson5/src/json5/version.py ../../build/scripts/blinkbuild/__init__.py ../../build/scripts/blinkbuild/name_style_converter.py build_web_idl_database.py --- a/third_party/blink/renderer/bindings/scripts/collect_idl_files.pydeps +++ b/third_party/blink/renderer/bindings/scripts/collect_idl_files.pydeps @@ -4,13 +4,6 @@ ../../../../../tools/idl_parser/idl_lexer.py ../../../../../tools/idl_parser/idl_node.py ../../../../../tools/idl_parser/idl_parser.py -../../../../ply/__init__.py -../../../../ply/lex.py -../../../../ply/yacc.py -../../../../pyjson5/src/json5/__init__.py -../../../../pyjson5/src/json5/lib.py -../../../../pyjson5/src/json5/parser.py -../../../../pyjson5/src/json5/version.py ../../build/scripts/blinkbuild/__init__.py ../../build/scripts/blinkbuild/name_style_converter.py collect_idl_files.py --- a/third_party/blink/renderer/bindings/scripts/generate_bindings.pydeps +++ b/third_party/blink/renderer/bindings/scripts/generate_bindings.pydeps @@ -2,29 +2,6 @@ # build/print_python_deps.py --root third_party/blink/renderer/bindings/scripts --output third_party/blink/renderer/bindings/scripts/generate_bindings.pydeps third_party/blink/renderer/bindings/scripts/generate_bindings.py ../../../../../tools/idl_parser/__init__.py ../../../../../tools/idl_parser/idl_node.py -../../../../mako/mako/mako/__init__.py -../../../../mako/mako/mako/_ast_util.py -../../../../mako/mako/mako/ast.py -../../../../mako/mako/mako/cache.py -../../../../mako/mako/mako/codegen.py -../../../../mako/mako/mako/compat.py -../../../../mako/mako/mako/exceptions.py -../../../../mako/mako/mako/ext/__init__.py -../../../../mako/mako/mako/filters.py -../../../../mako/mako/mako/lexer.py -../../../../mako/mako/mako/parsetree.py -../../../../mako/mako/mako/pygen.py -../../../../mako/mako/mako/pyparser.py -../../../../mako/mako/mako/runtime.py -../../../../mako/mako/mako/template.py -../../../../mako/mako/mako/util.py -../../../../markupsafe/__init__.py -../../../../markupsafe/_compat.py -../../../../markupsafe/_native.py -../../../../pyjson5/src/json5/__init__.py -../../../../pyjson5/src/json5/lib.py -../../../../pyjson5/src/json5/parser.py -../../../../pyjson5/src/json5/version.py ../../build/scripts/blinkbuild/__init__.py ../../build/scripts/blinkbuild/name_style_converter.py bind_gen/__init__.py --- src/third_party/blink/renderer/bindings/scripts/check_generated_file_list.pydeps.old 2022-11-30 10:28:05.822183900 +0000 +++ src/third_party/blink/renderer/bindings/scripts/check_generated_file_list.pydeps 2022-11-30 19:51:45.562760400 +0000 @@ -2,29 +2,6 @@ # build/print_python_deps.py --root third_party/blink/renderer/bindings/scripts --output third_party/blink/renderer/bindings/scripts/check_generated_file_list.pydeps third_party/blink/renderer/bindings/scripts/check_generated_file_list.py ../../../../../tools/idl_parser/__init__.py ../../../../../tools/idl_parser/idl_node.py -../../../../mako/mako/mako/__init__.py -../../../../mako/mako/mako/_ast_util.py -../../../../mako/mako/mako/ast.py -../../../../mako/mako/mako/cache.py -../../../../mako/mako/mako/codegen.py -../../../../mako/mako/mako/compat.py -../../../../mako/mako/mako/exceptions.py -../../../../mako/mako/mako/ext/__init__.py -../../../../mako/mako/mako/filters.py -../../../../mako/mako/mako/lexer.py -../../../../mako/mako/mako/parsetree.py -../../../../mako/mako/mako/pygen.py -../../../../mako/mako/mako/pyparser.py -../../../../mako/mako/mako/runtime.py -../../../../mako/mako/mako/template.py -../../../../mako/mako/mako/util.py -../../../../markupsafe/__init__.py -../../../../markupsafe/_compat.py -../../../../markupsafe/_native.py -../../../../pyjson5/src/json5/__init__.py -../../../../pyjson5/src/json5/lib.py -../../../../pyjson5/src/json5/parser.py -../../../../pyjson5/src/json5/version.py ../../build/scripts/blinkbuild/__init__.py ../../build/scripts/blinkbuild/name_style_converter.py bind_gen/__init__.py --- src/third_party/blink/renderer/bindings/scripts/validate_web_idl.pydeps.old 2022-11-30 10:28:05.822183900 +0000 +++ src/third_party/blink/renderer/bindings/scripts/validate_web_idl.pydeps 2022-11-30 20:00:16.870556700 +0000 @@ -2,10 +2,6 @@ # build/print_python_deps.py --root third_party/blink/renderer/bindings/scripts --output third_party/blink/renderer/bindings/scripts/validate_web_idl.pydeps third_party/blink/renderer/bindings/scripts/validate_web_idl.py ../../../../../tools/idl_parser/__init__.py ../../../../../tools/idl_parser/idl_node.py -../../../../pyjson5/src/json5/__init__.py -../../../../pyjson5/src/json5/lib.py -../../../../pyjson5/src/json5/parser.py -../../../../pyjson5/src/json5/version.py ../../build/scripts/blinkbuild/__init__.py ../../build/scripts/blinkbuild/name_style_converter.py validate_web_idl.py --- src/mojo/public/tools/bindings/mojom.gni.orig 2025-04-11 12:05:21.530272509 +0200 +++ src/mojo/public/tools/bindings/mojom.gni 2025-04-11 20:56:50.579500868 +0200 @@ -802,7 +802,7 @@ template("mojom") { action("${parser_target_name}_action") { script = mojom_parser_script - inputs = mojom_parser_sources + ply_sources + [ build_metadata_filename ] + inputs = mojom_parser_sources + [ build_metadata_filename ] sources = sources_list public_deps = parser_deps outputs = action_outputs --- src/third_party/blink/renderer/build/scripts/scripts.gni.orig 2024-12-08 18:35:01.138006834 +0100 +++ src/third_party/blink/renderer/build/scripts/scripts.gni 2024-12-18 13:24:36.436191575 +0100 @@ -18,10 +18,6 @@ if (is_ios) { _scripts_dir = "//third_party/blink/renderer/build/scripts" scripts_for_json5_files = jinja2_sources + [ - "//third_party/pyjson5/src/json5/__init__.py", - "//third_party/pyjson5/src/json5/lib.py", - "//third_party/pyjson5/src/json5/parser.py", - "//third_party/pyjson5/src/json5/version.py", "$_scripts_dir/blinkbuild/name_style_converter.py", "$_scripts_dir/json5_generator.py", "$_scripts_dir/license.py", --- src/third_party/blink/renderer/bindings/scripts/generate_event_interface_names.pydeps.old +++ src/third_party/blink/renderer/bindings/scripts/generate_event_interface_names.pydeps @@ -2,10 +2,6 @@ # build/print_python_deps.py --root third_party/blink/renderer/bindings/scripts --output third_party/blink/renderer/bindings/scripts/generate_event_interface_names.pydeps third_party/blink/renderer/bindings/scripts/generate_event_interface_names.py ../../../../../tools/idl_parser/__init__.py ../../../../../tools/idl_parser/idl_node.py -../../../../pyjson5/src/json5/__init__.py -../../../../pyjson5/src/json5/lib.py -../../../../pyjson5/src/json5/parser.py -../../../../pyjson5/src/json5/version.py ../../build/scripts/blinkbuild/__init__.py ../../build/scripts/blinkbuild/name_style_converter.py generate_event_interface_names.py --- src/third_party/jinja2/jinja2.gni.old 2023-11-09 21:20:56.224381300 +0100 +++ src/third_party/jinja2/jinja2.gni 2023-11-09 22:34:58.269569800 +0100 @@ -1,6 +1,7 @@ import("//third_party/markupsafe/markupsafe.gni") -jinja2_sources = [ +jinja2_sources = [] +xjinja2_sourcesx = [ "//third_party/jinja2/__init__.py", "//third_party/jinja2/_identifier.py", "//third_party/jinja2/async_utils.py", --- src/third_party/blink/renderer/core/sanitizer/builtins_all_known.py.orig 2025-04-16 14:36:32.677312629 +0200 +++ src/third_party/blink/renderer/core/sanitizer/builtins_all_known.py 2025-04-16 21:52:51.840741724 +0200 @@ -13,7 +13,7 @@ namespace that Blink's C++ implementatio import json import optparse import sys -from pyjson5.src import json5 +import json5 def error(context, *infos):