Merging 18 commit(s) from Chromium's toolchain-utils am: 0ae38c8498 am: 2a19d36a82 am: e617e3393dr_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-b-release

Change-Id: I3f25c7ee034b2e20e37ed941b8eae24eec7043eb

1 files changed, 44 insertions, 33 deletions

diff --git a/debug_info_test/whitelist.py b/debug_info_test/whitelist.py
index 383fcc3d..b53387a8 100644
--- a/debug_info_test/whitelist.py
+++ b/debug_info_test/whitelist.py
@@ -1,11 +1,17 @@
+# -*- coding: utf-8 -*-
 # Copyright 2018 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+"""Whitelist functions."""
+
+from __future__ import print_function
+
 import os
 import glob
 import re
 
+
 # Matching a string of length m in an NFA of size n is O(mn^2), but the
 # performance also depends largely on the implementation. It appears to be fast
 # enough according to the tests.
@@ -13,45 +19,50 @@ import re
 # The performance bottleneck of this script is readelf. Unless this becomes
 # slower than readelf, don't waste time here.
 def is_whitelisted(list_name, pattern):
-    """chech whether the given pattern is specified in the whitelist.
+  """Check whether the given pattern is specified in the whitelist.
+
+  Args:
+    list_name: name of the whitelist.
+    pattern: the target string.
+
+  Returns:
+    True if matched otherwise False.
+  """
+  return pattern and whitelists[list_name].match(pattern)
 
-    Args:
-        list_name: name of the whitelist
-        pattern: the target string
-    Returns:
-        True if matched otherwise False
-    """
-    return pattern and whitelists[list_name].match(pattern)
 
 def prepare_whitelist(patterns):
-    """Join and compile the re patterns.
+  """Join and compile the re patterns.
+
+  Args:
+    patterns: regex patterns.
+
+  Returns:
+    A compiled re object.
+  """
+  return re.compile('|'.join(patterns))
 
-    Args:
-        patterns: regex patterns.
-    Return:
-        A compiled re object
-    """
-    return re.compile('|'.join(patterns))
 
 def load_whitelists(dirname):
-    """Load whitelists under dirname.
-
-    A whitelist ends with .whitelist.
-
-    Args:
-        dirname: path to the dir.
-    Returns:
-        A dictionary of 'filename' -> whitelist matcher.
-    """
-    wlist = {}
-    for fn in glob.glob(os.path.join(dirname, '*.whitelist')):
-        key = os.path.splitext(os.path.basename(fn))[0]
-        with open(fn, 'r') as f:
-            patterns = f.read().splitlines()
-            patterns = [l for l in patterns if l != '']
-            patterns = [l for l in patterns if l[0] != '#']
-        wlist[key] = prepare_whitelist(patterns)
-    return wlist
+  """Load whitelists under dirname.
+
+  A whitelist ends with .whitelist.
+
+  Args:
+    dirname: path to the dir.
+
+  Returns:
+    A dictionary of 'filename' -> whitelist matcher.
+  """
+  wlist = {}
+  for fn in glob.glob(os.path.join(dirname, '*.whitelist')):
+    key = os.path.splitext(os.path.basename(fn))[0]
+    with open(fn, 'r', encoding='utf-8') as f:
+      patterns = f.read().splitlines()
+      patterns = [l for l in patterns if l != '']
+      patterns = [l for l in patterns if l[0] != '#']
+    wlist[key] = prepare_whitelist(patterns)
+  return wlist
 
 
 whitelists = load_whitelists(os.path.dirname(__file__))