From 2c2219b60e2a25f03b75176a4f27b1ff4a86ebca Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Wed, 25 Aug 2021 17:47:43 +0000 Subject: Apply pylint to remaining scripts in hiddenapi 1. Run pyformat scripts/hiddenapi -s 4 --force_quote_type none -i to fix formatting. 2. rename restricted variable names (e.g. variable name "input" has been changed to "csvfile") 3. use pylint: disable= where fixes are not obvious Test: m merge_csv signature_patterns signature_patterns_test Test: pylint --rcfile tools/repohooks/tools/pylintrc Bug: 195738175 Change-Id: I800a208f9c0ee1d32e68e4b20fd5933b3ab92c0e --- scripts/hiddenapi/signature_patterns.py | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) (limited to 'scripts/hiddenapi/signature_patterns.py') diff --git a/scripts/hiddenapi/signature_patterns.py b/scripts/hiddenapi/signature_patterns.py index a7c5bb4f3..0acb2a004 100755 --- a/scripts/hiddenapi/signature_patterns.py +++ b/scripts/hiddenapi/signature_patterns.py @@ -13,22 +13,26 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -""" -Generate a set of signature patterns from the modular flags generated by a +"""Generate a set of signature patterns from the modular flags generated by a bootclasspath_fragment that can be used to select a subset of monolithic flags against which the modular flags can be compared. """ import argparse import csv +import sys + +def dict_reader(csvfile): + return csv.DictReader( + csvfile, delimiter=',', quotechar='|', fieldnames=['signature'] + ) -def dict_reader(input): - return csv.DictReader(input, delimiter=',', quotechar='|', fieldnames=['signature']) def produce_patterns_from_file(file): with open(file, 'r') as f: return produce_patterns_from_stream(f) + def produce_patterns_from_stream(stream): # Read in all the signatures into a list and remove member names. patterns = set() @@ -38,18 +42,26 @@ def produce_patterns_from_stream(stream): # Remove the class specific member signature pieces = text.split(";->") qualifiedClassName = pieces[0] - # Remove inner class names as they cannot be separated from the containing outer class. + # Remove inner class names as they cannot be separated + # from the containing outer class. pieces = qualifiedClassName.split("$", maxsplit=1) pattern = pieces[0] patterns.add(pattern) - patterns = list(patterns) + patterns = list(patterns) #pylint: disable=redefined-variable-type patterns.sort() return patterns + def main(args): - args_parser = argparse.ArgumentParser(description='Generate a set of signature patterns that select a subset of monolithic hidden API files.') - args_parser.add_argument('--flags', help='The stub flags file which contains an entry for every dex member') + args_parser = argparse.ArgumentParser( + description='Generate a set of signature patterns ' + 'that select a subset of monolithic hidden API files.' + ) + args_parser.add_argument( + '--flags', + help='The stub flags file which contains an entry for every dex member', + ) args_parser.add_argument('--output', help='Generated signature prefixes') args = args_parser.parse_args(args) @@ -62,5 +74,6 @@ def main(args): outputFile.write(pattern) outputFile.write("\n") + if __name__ == "__main__": main(sys.argv[1:]) -- cgit v1.2.3-59-g8ed1b