Upgrade toolchain-utils to 2c474af4f370b143032144aff1ff1985f789e20f am: 8b320f7173 am: d444309511android-u-beta-1-gplllvm-r487747

Original change: https://android-review.googlesource.com/c/platform/external/toolchain-utils/+/2292563

Change-Id: I0c22edd3e962fb6c4b0cbd412a1eb884e00c77cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 15 insertions, 16 deletions

diff --git a/binary_search_tool/test/switch_to_bad_set_file.py b/binary_search_tool/test/switch_to_bad_set_file.py
index 5b941c62..9d4bee6f 100755
--- a/binary_search_tool/test/switch_to_bad_set_file.py
+++ b/binary_search_tool/test/switch_to_bad_set_file.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.
 
@@ -10,7 +10,6 @@ This script is meant to be specifically used with the set_file test. This uses
 the set files generated by binary_search_state to do the switching.
 """
 
-from __future__ import print_function
 
 import os
 import sys
@@ -19,24 +18,24 @@ from binary_search_tool.test import common
 
 
 def Main(_):
-  """Switch part of the objects file in working set to (possible) bad ones."""
-  working_set = common.ReadWorkingSet()
-  objects_file = common.ReadObjectsFile()
+    """Switch part of the objects file in working set to (possible) bad ones."""
+    working_set = common.ReadWorkingSet()
+    objects_file = common.ReadObjectsFile()
 
-  if not os.path.exists(os.environ['BISECT_BAD_SET']):
-    print('Bad set file does not exist!')
-    return 1
+    if not os.path.exists(os.environ["BISECT_BAD_SET"]):
+        print("Bad set file does not exist!")
+        return 1
 
-  object_index = common.ReadObjectIndex(os.environ['BISECT_BAD_SET'])
+    object_index = common.ReadObjectIndex(os.environ["BISECT_BAD_SET"])
 
-  for oi in object_index:
-    working_set[int(oi)] = objects_file[oi]
+    for oi in object_index:
+        working_set[int(oi)] = objects_file[oi]
 
-  common.WriteWorkingSet(working_set)
+    common.WriteWorkingSet(working_set)
 
-  return 0
+    return 0
 
 
-if __name__ == '__main__':
-  retval = Main(sys.argv)
-  sys.exit(retval)
+if __name__ == "__main__":
+    retval = Main(sys.argv)
+    sys.exit(retval)