aboutsummaryrefslogtreecommitdiff
path: root/binary_search_tool
diff options
context:
space:
mode:
authorGeorge Burgess IV <gbiv@google.com>2022-09-06 12:12:02 -0700
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-09-07 21:15:10 +0000
commitc0041a9550814e402f661a560855ff99863cffb2 (patch)
tree0ee1cc2f9680930fd230868df063fb0f38423623 /binary_search_tool
parent84556973468631cce626a9cebb7b23439afa763e (diff)
downloadtoolchain-utils-c0041a9550814e402f661a560855ff99863cffb2.tar.gz
remove `from __future__ import ...` directives
These are only useful when we're running code in a Python 2.7 interpreter. Since we no longer support python2, drop these. BUG=b:244644217 TEST=run_tests_for.py shows no new failures Change-Id: Ief9a12b87a560ab38ca71668636874bcb434a0b3 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/3877339 Reviewed-by: Ryan Beltran <ryanbeltran@chromium.org> Commit-Queue: George Burgess <gbiv@chromium.org> Reviewed-by: Jordan Abrahams-Whitehead <ajordanr@google.com> Tested-by: George Burgess <gbiv@chromium.org>
Diffstat (limited to 'binary_search_tool')
-rwxr-xr-xbinary_search_tool/binary_search_perforce.py2
-rwxr-xr-xbinary_search_tool/binary_search_state.py2
-rw-r--r--binary_search_tool/bisect_driver.py1
-rw-r--r--binary_search_tool/common.py1
-rwxr-xr-xbinary_search_tool/compiler_wrapper.py1
-rwxr-xr-xbinary_search_tool/cros_pkg/create_cleanup_script.py1
-rwxr-xr-xbinary_search_tool/run_bisect.py1
-rwxr-xr-xbinary_search_tool/run_bisect_tests.py1
-rwxr-xr-xbinary_search_tool/sysroot_wrapper/testing_test.py1
-rwxr-xr-xbinary_search_tool/test/binary_search_tool_test.py2
-rwxr-xr-xbinary_search_tool/test/cmd_script.py1
-rw-r--r--binary_search_tool/test/cmd_script_no_support.py1
-rwxr-xr-xbinary_search_tool/test/gen_init_list.py1
-rwxr-xr-xbinary_search_tool/test/gen_obj.py1
-rwxr-xr-xbinary_search_tool/test/generate_cmd.py1
-rwxr-xr-xbinary_search_tool/test/is_good.py1
-rwxr-xr-xbinary_search_tool/test/is_good_noinc_prune.py1
-rwxr-xr-xbinary_search_tool/test/switch_tmp.py1
-rwxr-xr-xbinary_search_tool/test/switch_to_bad.py1
-rwxr-xr-xbinary_search_tool/test/switch_to_bad_noinc_prune.py1
-rwxr-xr-xbinary_search_tool/test/switch_to_bad_set_file.py1
-rwxr-xr-xbinary_search_tool/test/switch_to_good.py1
-rwxr-xr-xbinary_search_tool/test/switch_to_good_noinc_prune.py1
-rwxr-xr-xbinary_search_tool/test/switch_to_good_set_file.py1
-rwxr-xr-xbinary_search_tool/test/test_setup.py1
-rwxr-xr-xbinary_search_tool/test/test_setup_bad.py1
26 files changed, 0 insertions, 29 deletions
diff --git a/binary_search_tool/binary_search_perforce.py b/binary_search_tool/binary_search_perforce.py
index b4332ab6..d8e7f77b 100755
--- a/binary_search_tool/binary_search_perforce.py
+++ b/binary_search_tool/binary_search_perforce.py
@@ -5,8 +5,6 @@
# found in the LICENSE file.
"""Module of binary serch for perforce."""
-from __future__ import division
-from __future__ import print_function
import argparse
import math
diff --git a/binary_search_tool/binary_search_state.py b/binary_search_tool/binary_search_state.py
index 1ede37f8..bd04d1b1 100755
--- a/binary_search_tool/binary_search_state.py
+++ b/binary_search_tool/binary_search_state.py
@@ -6,8 +6,6 @@
"""The binary search wrapper."""
-from __future__ import division
-from __future__ import print_function
import argparse
import contextlib
diff --git a/binary_search_tool/bisect_driver.py b/binary_search_tool/bisect_driver.py
index 2f6cd85b..ddab1682 100644
--- a/binary_search_tool/bisect_driver.py
+++ b/binary_search_tool/bisect_driver.py
@@ -19,7 +19,6 @@ Design doc:
https://docs.google.com/document/d/1yDgaUIa2O5w6dc3sSTe1ry-1ehKajTGJGQCbyn0fcEM
"""
-from __future__ import print_function
import contextlib
import fcntl
diff --git a/binary_search_tool/common.py b/binary_search_tool/common.py
index b8a7a1d2..1f7886f4 100644
--- a/binary_search_tool/common.py
+++ b/binary_search_tool/common.py
@@ -21,7 +21,6 @@ ArgumentDict inherits OrderedDict in order to preserve the order the args are
created so the help text is made properly.
"""
-from __future__ import print_function
import collections
import os
diff --git a/binary_search_tool/compiler_wrapper.py b/binary_search_tool/compiler_wrapper.py
index acb7f9eb..02dd332e 100755
--- a/binary_search_tool/compiler_wrapper.py
+++ b/binary_search_tool/compiler_wrapper.py
@@ -20,7 +20,6 @@ Design doc:
https://docs.google.com/document/d/1yDgaUIa2O5w6dc3sSTe1ry-1ehKajTGJGQCbyn0fcEM
"""
-from __future__ import print_function
import os
import shlex
diff --git a/binary_search_tool/cros_pkg/create_cleanup_script.py b/binary_search_tool/cros_pkg/create_cleanup_script.py
index aebf523a..5c46d3ef 100755
--- a/binary_search_tool/cros_pkg/create_cleanup_script.py
+++ b/binary_search_tool/cros_pkg/create_cleanup_script.py
@@ -13,7 +13,6 @@ undo the changes made by setup.sh, returning everything to its
original state.
"""
-from __future__ import print_function
import argparse
import sys
diff --git a/binary_search_tool/run_bisect.py b/binary_search_tool/run_bisect.py
index eeda98cc..480408d7 100755
--- a/binary_search_tool/run_bisect.py
+++ b/binary_search_tool/run_bisect.py
@@ -6,7 +6,6 @@
"""The unified package/object bisecting tool."""
-from __future__ import print_function
import abc
import argparse
diff --git a/binary_search_tool/run_bisect_tests.py b/binary_search_tool/run_bisect_tests.py
index 22092ff9..ae230131 100755
--- a/binary_search_tool/run_bisect_tests.py
+++ b/binary_search_tool/run_bisect_tests.py
@@ -6,7 +6,6 @@
"""Run full bisection test."""
-from __future__ import print_function
import argparse
import os
diff --git a/binary_search_tool/sysroot_wrapper/testing_test.py b/binary_search_tool/sysroot_wrapper/testing_test.py
index 2523c0be..20bc7f75 100755
--- a/binary_search_tool/sysroot_wrapper/testing_test.py
+++ b/binary_search_tool/sysroot_wrapper/testing_test.py
@@ -11,7 +11,6 @@ chromeos-chrome built for a daisy board, if you are using another package you
will need to change the base_path accordingly.
"""
-from __future__ import print_function
import subprocess
import sys
diff --git a/binary_search_tool/test/binary_search_tool_test.py b/binary_search_tool/test/binary_search_tool_test.py
index f9070989..b2bbec01 100755
--- a/binary_search_tool/test/binary_search_tool_test.py
+++ b/binary_search_tool/test/binary_search_tool_test.py
@@ -6,8 +6,6 @@
"""Tests for bisecting tool."""
-from __future__ import division
-from __future__ import print_function
__author__ = "shenhan@google.com (Han Shen)"
diff --git a/binary_search_tool/test/cmd_script.py b/binary_search_tool/test/cmd_script.py
index b668280e..73852bc5 100755
--- a/binary_search_tool/test/cmd_script.py
+++ b/binary_search_tool/test/cmd_script.py
@@ -11,7 +11,6 @@ It assumes that -opt-bisect-limit and -print-debug-counter are supported by the
compiler.
"""
-from __future__ import print_function
import os
import sys
diff --git a/binary_search_tool/test/cmd_script_no_support.py b/binary_search_tool/test/cmd_script_no_support.py
index d2c8c39b..7c5297d2 100644
--- a/binary_search_tool/test/cmd_script_no_support.py
+++ b/binary_search_tool/test/cmd_script_no_support.py
@@ -9,7 +9,6 @@ This script generates a pseudo log when certain bisecting flags are not
supported by compiler.
"""
-from __future__ import print_function
import os
import sys
diff --git a/binary_search_tool/test/gen_init_list.py b/binary_search_tool/test/gen_init_list.py
index 1fe1b43e..927ad22c 100755
--- a/binary_search_tool/test/gen_init_list.py
+++ b/binary_search_tool/test/gen_init_list.py
@@ -6,7 +6,6 @@
"""Prints out index for every object file, starting from 0."""
-from __future__ import print_function
import sys
diff --git a/binary_search_tool/test/gen_obj.py b/binary_search_tool/test/gen_obj.py
index aa9a9344..e1eb4913 100755
--- a/binary_search_tool/test/gen_obj.py
+++ b/binary_search_tool/test/gen_obj.py
@@ -10,7 +10,6 @@
1 represents a bad object file.
"""
-from __future__ import print_function
import argparse
import os
diff --git a/binary_search_tool/test/generate_cmd.py b/binary_search_tool/test/generate_cmd.py
index bcfe176d..b02c2ad3 100755
--- a/binary_search_tool/test/generate_cmd.py
+++ b/binary_search_tool/test/generate_cmd.py
@@ -10,7 +10,6 @@ This is a required argument for pass level bisecting. For unit test, we use
this script to verify if cmd_script.sh is generated correctly.
"""
-from __future__ import print_function
import os
import sys
diff --git a/binary_search_tool/test/is_good.py b/binary_search_tool/test/is_good.py
index 3be7248f..51ee742c 100755
--- a/binary_search_tool/test/is_good.py
+++ b/binary_search_tool/test/is_good.py
@@ -6,7 +6,6 @@
"""Check to see if the working set produces a good executable."""
-from __future__ import print_function
import os
import sys
diff --git a/binary_search_tool/test/is_good_noinc_prune.py b/binary_search_tool/test/is_good_noinc_prune.py
index 4e520162..5fe4ed72 100755
--- a/binary_search_tool/test/is_good_noinc_prune.py
+++ b/binary_search_tool/test/is_good_noinc_prune.py
@@ -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
diff --git a/binary_search_tool/test/switch_tmp.py b/binary_search_tool/test/switch_tmp.py
index 2ff35427..674433eb 100755
--- a/binary_search_tool/test/switch_tmp.py
+++ b/binary_search_tool/test/switch_tmp.py
@@ -12,7 +12,6 @@ this script) content. Every line in the file is an object index, which will be
set to good (mark as 42).
"""
-from __future__ import print_function
import sys
diff --git a/binary_search_tool/test/switch_to_bad.py b/binary_search_tool/test/switch_to_bad.py
index 17061dd3..c711d19f 100755
--- a/binary_search_tool/test/switch_to_bad.py
+++ b/binary_search_tool/test/switch_to_bad.py
@@ -6,7 +6,6 @@
"""Switch part of the objects file in working set to (possible) bad ones."""
-from __future__ import print_function
import sys
diff --git a/binary_search_tool/test/switch_to_bad_noinc_prune.py b/binary_search_tool/test/switch_to_bad_noinc_prune.py
index dd57324f..473ade81 100755
--- a/binary_search_tool/test/switch_to_bad_noinc_prune.py
+++ b/binary_search_tool/test/switch_to_bad_noinc_prune.py
@@ -18,7 +18,6 @@ that noincremental always holds).
Warning: This switch script assumes the --file_args option
"""
-from __future__ import print_function
import shutil
import sys
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 6a4f9131..002622de 100755
--- a/binary_search_tool/test/switch_to_bad_set_file.py
+++ b/binary_search_tool/test/switch_to_bad_set_file.py
@@ -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
diff --git a/binary_search_tool/test/switch_to_good.py b/binary_search_tool/test/switch_to_good.py
index bcbe5c28..a4d173d2 100755
--- a/binary_search_tool/test/switch_to_good.py
+++ b/binary_search_tool/test/switch_to_good.py
@@ -11,7 +11,6 @@ this script) content. Every line in the file is an object index, which will be
set to good (mark as 0).
"""
-from __future__ import print_function
import sys
diff --git a/binary_search_tool/test/switch_to_good_noinc_prune.py b/binary_search_tool/test/switch_to_good_noinc_prune.py
index 37976668..8ed8d0ca 100755
--- a/binary_search_tool/test/switch_to_good_noinc_prune.py
+++ b/binary_search_tool/test/switch_to_good_noinc_prune.py
@@ -18,7 +18,6 @@ that noincremental always holds).
Warning: This switch script assumes the --file_args option
"""
-from __future__ import print_function
import shutil
import sys
diff --git a/binary_search_tool/test/switch_to_good_set_file.py b/binary_search_tool/test/switch_to_good_set_file.py
index 89b8bf17..a1feaddf 100755
--- a/binary_search_tool/test/switch_to_good_set_file.py
+++ b/binary_search_tool/test/switch_to_good_set_file.py
@@ -14,7 +14,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
diff --git a/binary_search_tool/test/test_setup.py b/binary_search_tool/test/test_setup.py
index 4fe8c661..5ee35c55 100755
--- a/binary_search_tool/test/test_setup.py
+++ b/binary_search_tool/test/test_setup.py
@@ -6,7 +6,6 @@
"""Emulate running of test setup script, is_good.py should fail without this."""
-from __future__ import print_function
import sys
diff --git a/binary_search_tool/test/test_setup_bad.py b/binary_search_tool/test/test_setup_bad.py
index f34753bf..4879f455 100755
--- a/binary_search_tool/test/test_setup_bad.py
+++ b/binary_search_tool/test/test_setup_bad.py
@@ -6,7 +6,6 @@
"""Emulate test setup that fails (i.e. failed flash to device)"""
-from __future__ import print_function
import sys