Snap for 9550355 from d44430951159ca340cd4c4e699917348f82abad8 to sdk-releaseplatform-tools-34.0.1platform-tools-34.0.0platform-tools-33.0.4

Change-Id: I9ee07a3c89be79d32ad2cf53a87531e566b38107

1 files changed, 22 insertions, 23 deletions

diff --git a/binary_search_tool/test/is_good_noinc_prune.py b/binary_search_tool/test/is_good_noinc_prune.py
index c0e42bb1..654fcd25 100755
--- a/binary_search_tool/test/is_good_noinc_prune.py
+++ b/binary_search_tool/test/is_good_noinc_prune.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
+# Copyright 2020 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -12,7 +12,6 @@ to the switch scripts is equals to the actual number of items (i.e. checking
 that noincremental always holds).
 """
 
-from __future__ import print_function
 
 import os
 import sys
@@ -21,31 +20,31 @@ from binary_search_tool.test import common
 
 
 def Main():
-  working_set = common.ReadWorkingSet()
+    working_set = common.ReadWorkingSet()
 
-  with open('noinc_prune_good', 'r', encoding='utf-8') as good_args:
-    num_good_args = len(good_args.readlines())
+    with open("noinc_prune_good", "r", encoding="utf-8") as good_args:
+        num_good_args = len(good_args.readlines())
 
-  with open('noinc_prune_bad', 'r', encoding='utf-8') as bad_args:
-    num_bad_args = len(bad_args.readlines())
+    with open("noinc_prune_bad", "r", encoding="utf-8") as bad_args:
+        num_bad_args = len(bad_args.readlines())
 
-  num_args = num_good_args + num_bad_args
-  if num_args != len(working_set):
-    print('Only %d args, expected %d' % (num_args, len(working_set)))
-    print('%d good args, %d bad args' % (num_good_args, num_bad_args))
-    return 3
+    num_args = num_good_args + num_bad_args
+    if num_args != len(working_set):
+        print("Only %d args, expected %d" % (num_args, len(working_set)))
+        print("%d good args, %d bad args" % (num_good_args, num_bad_args))
+        return 3
 
-  os.remove('noinc_prune_bad')
-  os.remove('noinc_prune_good')
+    os.remove("noinc_prune_bad")
+    os.remove("noinc_prune_good")
 
-  if not os.path.exists('./is_setup'):
-    return 1
-  for w in working_set:
-    if w == 1:
-      return 1  ## False, linking failure
-  return 0
+    if not os.path.exists("./is_setup"):
+        return 1
+    for w in working_set:
+        if w == 1:
+            return 1  ## False, linking failure
+    return 0
 
 
-if __name__ == '__main__':
-  retval = Main()
-  sys.exit(retval)
+if __name__ == "__main__":
+    retval = Main()
+    sys.exit(retval)