From 18b7a2e8a242a7b8fab59fb3ac3b57902d9e6e4f Mon Sep 17 00:00:00 2001 From: Wei Li Date: Fri, 8 Jul 2022 19:09:06 -0700 Subject: [PATCH] JSON format doesn't support comments, so a JSONWithCommentsDecoder is added to support line comments start with // that used in apex_manifest.json files. This fixes the CI errors reported in b/238399517. Bug: 238399517 Test: build/bazel/ci/bp2build.sh Change-Id: Iaa3c2ab319eb7a52cbedaddd057646fc089d745a --- scripts/jsonmodify.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/jsonmodify.py b/scripts/jsonmodify.py index ba1109e7a..5132aa8f6 100755 --- a/scripts/jsonmodify.py +++ b/scripts/jsonmodify.py @@ -75,6 +75,14 @@ class AppendList(str): raise ValueError(self + " should be a array.") cur[key].extend(args) +# A JSONDecoder that supports line comments start with // +class JSONWithCommentsDecoder(json.JSONDecoder): + def __init__(self, **kw): + super().__init__(**kw) + + def decode(self, s: str): + s = '\n'.join(l for l in s.split('\n') if not l.lstrip(' ').startswith('//')) + return super().decode(s) def main(): parser = argparse.ArgumentParser() @@ -103,9 +111,9 @@ def main(): if args.input: with open(args.input) as f: - obj = json.load(f, object_pairs_hook=collections.OrderedDict) + obj = json.load(f, object_pairs_hook=collections.OrderedDict, cls=JSONWithCommentsDecoder) else: - obj = json.load(sys.stdin, object_pairs_hook=collections.OrderedDict) + obj = json.load(sys.stdin, object_pairs_hook=collections.OrderedDict, cls=JSONWithCommentsDecoder) for p in args.patch: p[0].apply(obj, *p[1:])