From 1d4bfd8ca411d9d9ed271b5489e2a4bc45cccad8 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Wed, 25 Aug 2021 22:58:46 +0000 Subject: [PATCH] Apply pylint to conv_linker_config.py 1. Run pyformat scripts/conv_linker_config.py -s 4 --force_quote_type none -i to fix formatting 2. Annotate #pylint: disable=import-error for linker_config_pb2 since it will be provided by soong Test: m conv_linker_config Test: pylint --rcfile tools/repohooks/tools/pylintrc build/soong/scripts/conv_linker_config.py Bug: 195738175 Change-Id: I791576cf65cb053f68c804f8ec5c2fc22976fdb4 --- scripts/conv_linker_config.py | 281 +++++++++++++++++----------------- 1 file changed, 142 insertions(+), 139 deletions(-) diff --git a/scripts/conv_linker_config.py b/scripts/conv_linker_config.py index 92f79dae8..e46efe494 100644 --- a/scripts/conv_linker_config.py +++ b/scripts/conv_linker_config.py @@ -20,178 +20,181 @@ import collections import json import os -import linker_config_pb2 +import linker_config_pb2 #pylint: disable=import-error from google.protobuf.descriptor import FieldDescriptor from google.protobuf.json_format import ParseDict from google.protobuf.text_format import MessageToString def Proto(args): - json_content = '' - with open(args.source) as f: - for line in f: - if not line.lstrip().startswith('//'): - json_content += line - obj = json.loads(json_content, object_pairs_hook=collections.OrderedDict) - pb = ParseDict(obj, linker_config_pb2.LinkerConfig()) - with open(args.output, 'wb') as f: - f.write(pb.SerializeToString()) + json_content = '' + with open(args.source) as f: + for line in f: + if not line.lstrip().startswith('//'): + json_content += line + obj = json.loads(json_content, object_pairs_hook=collections.OrderedDict) + pb = ParseDict(obj, linker_config_pb2.LinkerConfig()) + with open(args.output, 'wb') as f: + f.write(pb.SerializeToString()) def Print(args): - with open(args.source, 'rb') as f: - pb = linker_config_pb2.LinkerConfig() - pb.ParseFromString(f.read()) - print(MessageToString(pb)) + with open(args.source, 'rb') as f: + pb = linker_config_pb2.LinkerConfig() + pb.ParseFromString(f.read()) + print(MessageToString(pb)) def SystemProvide(args): - pb = linker_config_pb2.LinkerConfig() - with open(args.source, 'rb') as f: - pb.ParseFromString(f.read()) - libraries = args.value.split() + pb = linker_config_pb2.LinkerConfig() + with open(args.source, 'rb') as f: + pb.ParseFromString(f.read()) + libraries = args.value.split() - def IsInLibPath(lib_name): - lib_path = os.path.join(args.system, 'lib', lib_name) - lib64_path = os.path.join(args.system, 'lib64', lib_name) - return os.path.exists(lib_path) or os.path.islink(lib_path) or os.path.exists(lib64_path) or os.path.islink(lib64_path) + def IsInLibPath(lib_name): + lib_path = os.path.join(args.system, 'lib', lib_name) + lib64_path = os.path.join(args.system, 'lib64', lib_name) + return os.path.exists(lib_path) or os.path.islink( + lib_path) or os.path.exists(lib64_path) or os.path.islink( + lib64_path) - installed_libraries = list(filter(IsInLibPath, libraries)) - for item in installed_libraries: - if item not in getattr(pb, 'provideLibs'): - getattr(pb, 'provideLibs').append(item) - with open(args.output, 'wb') as f: - f.write(pb.SerializeToString()) + installed_libraries = [lib for lib in libraries if IsInLibPath(lib)] + for item in installed_libraries: + if item not in getattr(pb, 'provideLibs'): + getattr(pb, 'provideLibs').append(item) + with open(args.output, 'wb') as f: + f.write(pb.SerializeToString()) def Append(args): - pb = linker_config_pb2.LinkerConfig() - with open(args.source, 'rb') as f: - pb.ParseFromString(f.read()) + pb = linker_config_pb2.LinkerConfig() + with open(args.source, 'rb') as f: + pb.ParseFromString(f.read()) - if getattr(type(pb), args.key).DESCRIPTOR.label == FieldDescriptor.LABEL_REPEATED: - for value in args.value.split(): - getattr(pb, args.key).append(value) - else: - setattr(pb, args.key, args.value) + if getattr(type(pb), + args.key).DESCRIPTOR.label == FieldDescriptor.LABEL_REPEATED: + for value in args.value.split(): + getattr(pb, args.key).append(value) + else: + setattr(pb, args.key, args.value) + + with open(args.output, 'wb') as f: + f.write(pb.SerializeToString()) - with open(args.output, 'wb') as f: - f.write(pb.SerializeToString()) def Merge(args): - pb = linker_config_pb2.LinkerConfig() - for other in args.input: - with open(other, 'rb') as f: - pb.MergeFromString(f.read()) + pb = linker_config_pb2.LinkerConfig() + for other in args.input: + with open(other, 'rb') as f: + pb.MergeFromString(f.read()) + + with open(args.out, 'wb') as f: + f.write(pb.SerializeToString()) - with open(args.out, 'wb') as f: - f.write(pb.SerializeToString()) def GetArgParser(): - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers() + parser = argparse.ArgumentParser() + subparsers = parser.add_subparsers() - parser_proto = subparsers.add_parser( - 'proto', help='Convert the input JSON configuration file into protobuf.') - parser_proto.add_argument( - '-s', - '--source', - required=True, - type=str, - help='Source linker configuration file in JSON.') - parser_proto.add_argument( - '-o', - '--output', - required=True, - type=str, - help='Target path to create protobuf file.') - parser_proto.set_defaults(func=Proto) + parser_proto = subparsers.add_parser( + 'proto', + help='Convert the input JSON configuration file into protobuf.') + parser_proto.add_argument( + '-s', + '--source', + required=True, + type=str, + help='Source linker configuration file in JSON.') + parser_proto.add_argument( + '-o', + '--output', + required=True, + type=str, + help='Target path to create protobuf file.') + parser_proto.set_defaults(func=Proto) - print_proto = subparsers.add_parser( - 'print', help='Print configuration in human-readable text format.') - print_proto.add_argument( - '-s', - '--source', - required=True, - type=str, - help='Source linker configuration file in protobuf.') - print_proto.set_defaults(func=Print) + print_proto = subparsers.add_parser( + 'print', help='Print configuration in human-readable text format.') + print_proto.add_argument( + '-s', + '--source', + required=True, + type=str, + help='Source linker configuration file in protobuf.') + print_proto.set_defaults(func=Print) - system_provide_libs = subparsers.add_parser( - 'systemprovide', help='Append system provide libraries into the configuration.') - system_provide_libs.add_argument( - '-s', - '--source', - required=True, - type=str, - help='Source linker configuration file in protobuf.') - system_provide_libs.add_argument( - '-o', - '--output', - required=True, - type=str, - help='Target linker configuration file to write in protobuf.') - system_provide_libs.add_argument( - '--value', - required=True, - type=str, - help='Values of the libraries to append. If there are more than one it should be separated by empty space') - system_provide_libs.add_argument( - '--system', - required=True, - type=str, - help='Path of the system image.') - system_provide_libs.set_defaults(func=SystemProvide) + system_provide_libs = subparsers.add_parser( + 'systemprovide', + help='Append system provide libraries into the configuration.') + system_provide_libs.add_argument( + '-s', + '--source', + required=True, + type=str, + help='Source linker configuration file in protobuf.') + system_provide_libs.add_argument( + '-o', + '--output', + required=True, + type=str, + help='Target linker configuration file to write in protobuf.') + system_provide_libs.add_argument( + '--value', + required=True, + type=str, + help='Values of the libraries to append. If there are more than one ' + 'it should be separated by empty space' + ) + system_provide_libs.add_argument( + '--system', required=True, type=str, help='Path of the system image.') + system_provide_libs.set_defaults(func=SystemProvide) - append = subparsers.add_parser( - 'append', help='Append value(s) to given key.') - append.add_argument( - '-s', - '--source', - required=True, - type=str, - help='Source linker configuration file in protobuf.') - append.add_argument( - '-o', - '--output', - required=True, - type=str, - help='Target linker configuration file to write in protobuf.') - append.add_argument( - '--key', - required=True, - type=str, - help='.') - append.add_argument( - '--value', - required=True, - type=str, - help='Values of the libraries to append. If there are more than one it should be separated by empty space') - append.set_defaults(func=Append) + append = subparsers.add_parser( + 'append', help='Append value(s) to given key.') + append.add_argument( + '-s', + '--source', + required=True, + type=str, + help='Source linker configuration file in protobuf.') + append.add_argument( + '-o', + '--output', + required=True, + type=str, + help='Target linker configuration file to write in protobuf.') + append.add_argument('--key', required=True, type=str, help='.') + append.add_argument( + '--value', + required=True, + type=str, + help='Values of the libraries to append. If there are more than one' + 'it should be separated by empty space' + ) + append.set_defaults(func=Append) - append = subparsers.add_parser( - 'merge', help='Merge configurations') - append.add_argument( - '-o', - '--out', - required=True, - type=str, - help='Ouptut linker configuration file to write in protobuf.') - append.add_argument( - '-i', - '--input', - nargs='+', - type=str, - help='Linker configuration files to merge.') - append.set_defaults(func=Merge) + append = subparsers.add_parser('merge', help='Merge configurations') + append.add_argument( + '-o', + '--out', + required=True, + type=str, + help='Output linker configuration file to write in protobuf.') + append.add_argument( + '-i', + '--input', + nargs='+', + type=str, + help='Linker configuration files to merge.') + append.set_defaults(func=Merge) - return parser + return parser def main(): - args = GetArgParser().parse_args() - args.func(args) + args = GetArgParser().parse_args() + args.func(args) if __name__ == '__main__': - main() + main()