From c0041a9550814e402f661a560855ff99863cffb2 Mon Sep 17 00:00:00 2001 From: George Burgess IV Date: Tue, 6 Sep 2022 12:12:02 -0700 Subject: 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 Commit-Queue: George Burgess Reviewed-by: Jordan Abrahams-Whitehead Tested-by: George Burgess --- afdo_redaction/redact_profile.py | 2 -- afdo_redaction/redact_profile_test.py | 2 -- afdo_redaction/remove_cold_functions.py | 2 -- afdo_redaction/remove_cold_functions_test.py | 1 - afdo_redaction/remove_indirect_calls.py | 2 -- afdo_redaction/remove_indirect_calls_test.py | 1 - afdo_tools/bisection/afdo_prof_analysis.py | 1 - afdo_tools/bisection/afdo_prof_analysis_e2e_test.py | 1 - afdo_tools/bisection/afdo_prof_analysis_test.py | 1 - afdo_tools/generate_afdo_from_tryjob.py | 1 - afdo_tools/run_afdo_tryjob.py | 1 - binary_search_tool/binary_search_perforce.py | 2 -- binary_search_tool/binary_search_state.py | 2 -- binary_search_tool/bisect_driver.py | 1 - binary_search_tool/common.py | 1 - binary_search_tool/compiler_wrapper.py | 1 - binary_search_tool/cros_pkg/create_cleanup_script.py | 1 - binary_search_tool/run_bisect.py | 1 - binary_search_tool/run_bisect_tests.py | 1 - binary_search_tool/sysroot_wrapper/testing_test.py | 1 - binary_search_tool/test/binary_search_tool_test.py | 2 -- binary_search_tool/test/cmd_script.py | 1 - binary_search_tool/test/cmd_script_no_support.py | 1 - binary_search_tool/test/gen_init_list.py | 1 - binary_search_tool/test/gen_obj.py | 1 - binary_search_tool/test/generate_cmd.py | 1 - binary_search_tool/test/is_good.py | 1 - binary_search_tool/test/is_good_noinc_prune.py | 1 - binary_search_tool/test/switch_tmp.py | 1 - binary_search_tool/test/switch_to_bad.py | 1 - binary_search_tool/test/switch_to_bad_noinc_prune.py | 1 - binary_search_tool/test/switch_to_bad_set_file.py | 1 - binary_search_tool/test/switch_to_good.py | 1 - binary_search_tool/test/switch_to_good_noinc_prune.py | 1 - binary_search_tool/test/switch_to_good_set_file.py | 1 - binary_search_tool/test/test_setup.py | 1 - binary_search_tool/test/test_setup_bad.py | 1 - build_chromeos.py | 2 -- build_tc.py | 2 -- buildbot_test_llvm.py | 1 - buildbot_test_toolchains.py | 1 - chromiumos_image_diff.py | 2 -- compiler_wrapper/build.py | 1 - compiler_wrapper/bundle.py | 1 - cros_utils/buildbot_utils.py | 2 -- cros_utils/buildbot_utils_unittest.py | 1 - cros_utils/command_executer.py | 1 - cros_utils/command_executer_timeout_test.py | 2 -- cros_utils/command_executer_unittest.py | 1 - cros_utils/device_setup_utils.py | 3 --- cros_utils/device_setup_utils_unittest.py | 1 - cros_utils/email_sender.py | 1 - cros_utils/email_sender_unittest.py | 1 - cros_utils/file_utils.py | 1 - cros_utils/locks.py | 1 - cros_utils/logger.py | 1 - cros_utils/machines.py | 1 - cros_utils/misc.py | 3 --- cros_utils/misc_test.py | 2 -- cros_utils/no_pseudo_terminal_test.py | 1 - cros_utils/perf_diff.py | 2 -- cros_utils/tabulator.py | 2 -- cros_utils/tabulator_test.py | 1 - cros_utils/timeline.py | 2 -- cros_utils/timeline_test.py | 2 -- cros_utils/tiny_render.py | 1 - cros_utils/tiny_render_test.py | 1 - crosperf/benchmark.py | 2 -- crosperf/benchmark_run.py | 1 - crosperf/benchmark_run_unittest.py | 1 - crosperf/benchmark_unittest.py | 1 - crosperf/compare_machines.py | 1 - crosperf/config_unittest.py | 1 - crosperf/crosperf.py | 1 - crosperf/crosperf_unittest.py | 2 -- crosperf/download_images.py | 1 - crosperf/download_images_buildid_test.py | 1 - crosperf/download_images_unittest.py | 1 - crosperf/experiment.py | 1 - crosperf/experiment_factory.py | 1 - crosperf/experiment_factory_unittest.py | 1 - crosperf/experiment_file.py | 1 - crosperf/experiment_file_unittest.py | 1 - crosperf/experiment_runner.py | 1 - crosperf/experiment_runner_unittest.py | 1 - crosperf/experiment_status.py | 2 -- crosperf/flag_test_unittest.py | 1 - crosperf/generate_report.py | 2 -- crosperf/generate_report_unittest.py | 2 -- crosperf/help.py | 1 - crosperf/image_checksummer.py | 1 - crosperf/label.py | 1 - crosperf/machine_image_manager.py | 1 - crosperf/machine_image_manager_unittest.py | 1 - crosperf/machine_manager.py | 2 -- crosperf/machine_manager_unittest.py | 1 - crosperf/mock_instance.py | 1 - crosperf/results_cache.py | 2 -- crosperf/results_cache_unittest.py | 1 - crosperf/results_organizer.py | 1 - crosperf/results_organizer_unittest.py | 1 - crosperf/results_report.py | 1 - crosperf/results_report_templates.py | 1 - crosperf/results_report_unittest.py | 2 -- crosperf/schedv2.py | 2 -- crosperf/schedv2_unittest.py | 1 - crosperf/settings.py | 1 - crosperf/settings_factory.py | 1 - crosperf/settings_factory_unittest.py | 1 - crosperf/settings_unittest.py | 1 - crosperf/suite_runner.py | 2 -- crosperf/suite_runner_unittest.py | 1 - crosperf/translate_xbuddy.py | 1 - cwp/cr-os/fetch_gn_descs.py | 1 - cwp/cr-os/fetch_gn_descs_test.py | 1 - debug_info_test/allowlist.py | 1 - debug_info_test/check_cus.py | 1 - debug_info_test/check_exist.py | 1 - debug_info_test/check_icf.py | 1 - debug_info_test/check_ngcc.py | 1 - debug_info_test/debug_info_test.py | 1 - file_lock_machine.py | 3 --- file_lock_machine_test.py | 2 -- go/chromeos/setup_chromeos_testing.py | 1 - heatmaps/heat_map.py | 1 - heatmaps/heat_map_test.py | 1 - heatmaps/heatmap_generator.py | 2 -- heatmaps/heatmap_generator_test.py | 2 -- image_chromeos.py | 2 -- llvm_extra/create_ebuild_file.py | 1 - llvm_tools/auto_llvm_bisection.py | 1 - llvm_tools/auto_llvm_bisection_unittest.py | 1 - llvm_tools/chroot.py | 1 - llvm_tools/chroot_unittest.py | 1 - llvm_tools/copy_helpers_to_chromiumos_overlay.py | 1 - llvm_tools/custom_script_example.py | 1 - llvm_tools/failure_modes.py | 1 - llvm_tools/get_llvm_hash.py | 1 - llvm_tools/get_llvm_hash_unittest.py | 1 - llvm_tools/git.py | 1 - llvm_tools/git_llvm_rev.py | 1 - llvm_tools/git_unittest.py | 1 - llvm_tools/llvm_bisection.py | 1 - llvm_tools/llvm_bisection_unittest.py | 1 - llvm_tools/llvm_project.py | 1 - llvm_tools/modify_a_tryjob.py | 1 - llvm_tools/modify_a_tryjob_unittest.py | 1 - llvm_tools/nightly_revert_checker.py | 1 - llvm_tools/nightly_revert_checker_test.py | 1 - llvm_tools/subprocess_helpers.py | 1 - llvm_tools/test_helpers.py | 1 - llvm_tools/update_chromeos_llvm_hash_unittest.py | 1 - llvm_tools/update_packages_and_run_tests.py | 1 - llvm_tools/update_packages_and_run_tests_unittest.py | 1 - llvm_tools/update_tryjob_status.py | 1 - llvm_tools/update_tryjob_status_unittest.py | 1 - lock_machine.py | 1 - make_root_writable.py | 2 -- orderfile/post_process_orderfile.py | 2 -- orderfile/post_process_orderfile_test.py | 2 -- pgo_tools/merge_profdata_and_upload.py | 1 - remote_test.py | 2 -- run_tests_for.py | 1 - tc_enter_chroot.py | 2 -- update_telemetry_defaults.py | 2 -- 165 files changed, 208 deletions(-) diff --git a/afdo_redaction/redact_profile.py b/afdo_redaction/redact_profile.py index f37199e3..d9f3d6ab 100755 --- a/afdo_redaction/redact_profile.py +++ b/afdo_redaction/redact_profile.py @@ -24,8 +24,6 @@ It reads a textual AFDO profile from stdin, and prints a 'fixed' version of it to stdout. A summary of what the script actually did is printed to stderr. """ -from __future__ import division -from __future__ import print_function import collections import re diff --git a/afdo_redaction/redact_profile_test.py b/afdo_redaction/redact_profile_test.py index 154f8f7e..487c5091 100755 --- a/afdo_redaction/redact_profile_test.py +++ b/afdo_redaction/redact_profile_test.py @@ -6,8 +6,6 @@ """Tests for redact_profile.py.""" -from __future__ import division -from __future__ import print_function import io import unittest diff --git a/afdo_redaction/remove_cold_functions.py b/afdo_redaction/remove_cold_functions.py index 4b4eaec6..6501cec0 100755 --- a/afdo_redaction/remove_cold_functions.py +++ b/afdo_redaction/remove_cold_functions.py @@ -24,8 +24,6 @@ This is part of the effort to stablize the impact of AFDO profile on Chrome binary size. See crbug.com/1062014 for more context. """ -from __future__ import division -from __future__ import print_function import argparse import collections diff --git a/afdo_redaction/remove_cold_functions_test.py b/afdo_redaction/remove_cold_functions_test.py index a203ab15..ed8b1972 100755 --- a/afdo_redaction/remove_cold_functions_test.py +++ b/afdo_redaction/remove_cold_functions_test.py @@ -6,7 +6,6 @@ """Tests for remove_cold_functions.""" -from __future__ import print_function import io import unittest diff --git a/afdo_redaction/remove_indirect_calls.py b/afdo_redaction/remove_indirect_calls.py index 6d77ba7a..769bd0ff 100755 --- a/afdo_redaction/remove_indirect_calls.py +++ b/afdo_redaction/remove_indirect_calls.py @@ -17,8 +17,6 @@ objects as Chrome, this can become problematic, and lead to NaCl doubling in size (or worse). See crbug.com/1005023 and crbug.com/916130. """ -from __future__ import division -from __future__ import print_function import argparse import re diff --git a/afdo_redaction/remove_indirect_calls_test.py b/afdo_redaction/remove_indirect_calls_test.py index f3b4c5cc..b24de45a 100755 --- a/afdo_redaction/remove_indirect_calls_test.py +++ b/afdo_redaction/remove_indirect_calls_test.py @@ -6,7 +6,6 @@ """Tests for remove_indirect_calls""" -from __future__ import print_function import io import unittest diff --git a/afdo_tools/bisection/afdo_prof_analysis.py b/afdo_tools/bisection/afdo_prof_analysis.py index a7bb4a4c..ee9b0c92 100755 --- a/afdo_tools/bisection/afdo_prof_analysis.py +++ b/afdo_tools/bisection/afdo_prof_analysis.py @@ -20,7 +20,6 @@ exit code. The codes known to this script are: - >127: quit immediately """ -from __future__ import division, print_function import argparse import json diff --git a/afdo_tools/bisection/afdo_prof_analysis_e2e_test.py b/afdo_tools/bisection/afdo_prof_analysis_e2e_test.py index 4fe265c9..e9a72b13 100755 --- a/afdo_tools/bisection/afdo_prof_analysis_e2e_test.py +++ b/afdo_tools/bisection/afdo_prof_analysis_e2e_test.py @@ -6,7 +6,6 @@ """End-to-end test for afdo_prof_analysis.""" -from __future__ import absolute_import, division, print_function import json import os diff --git a/afdo_tools/bisection/afdo_prof_analysis_test.py b/afdo_tools/bisection/afdo_prof_analysis_test.py index 6d4b17d3..d21a3596 100755 --- a/afdo_tools/bisection/afdo_prof_analysis_test.py +++ b/afdo_tools/bisection/afdo_prof_analysis_test.py @@ -6,7 +6,6 @@ """Tests for afdo_prof_analysis.""" -from __future__ import print_function import random import io diff --git a/afdo_tools/generate_afdo_from_tryjob.py b/afdo_tools/generate_afdo_from_tryjob.py index 3c5c7f64..30f5b570 100755 --- a/afdo_tools/generate_afdo_from_tryjob.py +++ b/afdo_tools/generate_afdo_from_tryjob.py @@ -6,7 +6,6 @@ """Given a tryjob and perf profile, generates an AFDO profile.""" -from __future__ import print_function import argparse import distutils.spawn diff --git a/afdo_tools/run_afdo_tryjob.py b/afdo_tools/run_afdo_tryjob.py index 5112723e..1e832c4e 100755 --- a/afdo_tools/run_afdo_tryjob.py +++ b/afdo_tools/run_afdo_tryjob.py @@ -49,7 +49,6 @@ If you provide neither --use_afdo_generation_stage nor since it's safer. """ -from __future__ import print_function import argparse import collections 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 diff --git a/build_chromeos.py b/build_chromeos.py index 3a6a17e1..b5bc48fa 100755 --- a/build_chromeos.py +++ b/build_chromeos.py @@ -11,8 +11,6 @@ This script sets up the ChromeOS source in the given directory, matching a particular release of ChromeOS. """ -from __future__ import print_function - __author__ = ( "asharif@google.com (Ahmad Sharif) " diff --git a/build_tc.py b/build_tc.py index 8eed86ee..f1d025a4 100755 --- a/build_tc.py +++ b/build_tc.py @@ -9,8 +9,6 @@ This script sets up the toolchain if you give it the gcctools directory. """ -from __future__ import print_function - __author__ = "asharif@google.com (Ahmad Sharif)" diff --git a/buildbot_test_llvm.py b/buildbot_test_llvm.py index 25d269f5..38d3ff49 100755 --- a/buildbot_test_llvm.py +++ b/buildbot_test_llvm.py @@ -16,7 +16,6 @@ well as copying the result into a directory. # Script to test different toolchains against ChromeOS benchmarks. -from __future__ import print_function import argparse import datetime diff --git a/buildbot_test_toolchains.py b/buildbot_test_toolchains.py index 9f82fe8f..639b817e 100755 --- a/buildbot_test_toolchains.py +++ b/buildbot_test_toolchains.py @@ -16,7 +16,6 @@ well as copying the images into the seven-day reports directory. # Script to test different toolchains against ChromeOS benchmarks. -from __future__ import print_function import argparse import datetime diff --git a/chromiumos_image_diff.py b/chromiumos_image_diff.py index 5943f3aa..3b3ae912 100755 --- a/chromiumos_image_diff.py +++ b/chromiumos_image_diff.py @@ -20,8 +20,6 @@ And this script should be executed outside chroot. """ -from __future__ import print_function - __author__ = "shenhan@google.com (Han Shen)" diff --git a/compiler_wrapper/build.py b/compiler_wrapper/build.py index e7486c54..3b4b0571 100755 --- a/compiler_wrapper/build.py +++ b/compiler_wrapper/build.py @@ -6,7 +6,6 @@ """Build script that builds a binary from a bundle.""" -from __future__ import print_function import argparse import os.path diff --git a/compiler_wrapper/bundle.py b/compiler_wrapper/bundle.py index 2624376b..ddfa4e9c 100755 --- a/compiler_wrapper/bundle.py +++ b/compiler_wrapper/bundle.py @@ -6,7 +6,6 @@ """Build script that copies the go sources to a build destination.""" -from __future__ import print_function import argparse import os.path diff --git a/cros_utils/buildbot_utils.py b/cros_utils/buildbot_utils.py index 6cf159d8..eb1d255c 100644 --- a/cros_utils/buildbot_utils.py +++ b/cros_utils/buildbot_utils.py @@ -5,8 +5,6 @@ """Utilities for launching and accessing ChromeOS buildbots.""" -from __future__ import division -from __future__ import print_function import ast import json diff --git a/cros_utils/buildbot_utils_unittest.py b/cros_utils/buildbot_utils_unittest.py index e12ea19e..31d3e947 100755 --- a/cros_utils/buildbot_utils_unittest.py +++ b/cros_utils/buildbot_utils_unittest.py @@ -7,7 +7,6 @@ """Unittest for buildbot_utils.py.""" -from __future__ import print_function import time import unittest diff --git a/cros_utils/command_executer.py b/cros_utils/command_executer.py index a30ba752..aa6de4c0 100755 --- a/cros_utils/command_executer.py +++ b/cros_utils/command_executer.py @@ -6,7 +6,6 @@ """Utilities to run commands in outside/inside chroot and on the board.""" -from __future__ import print_function import getpass import os diff --git a/cros_utils/command_executer_timeout_test.py b/cros_utils/command_executer_timeout_test.py index 2798d227..92f2e9ce 100755 --- a/cros_utils/command_executer_timeout_test.py +++ b/cros_utils/command_executer_timeout_test.py @@ -7,8 +7,6 @@ """Timeout test for command_executer.""" -from __future__ import print_function - __author__ = "asharif@google.com (Ahmad Sharif)" diff --git a/cros_utils/command_executer_unittest.py b/cros_utils/command_executer_unittest.py index aade4eb0..ecb85f93 100755 --- a/cros_utils/command_executer_unittest.py +++ b/cros_utils/command_executer_unittest.py @@ -6,7 +6,6 @@ """Unittest for command_executer.py.""" -from __future__ import print_function import time import unittest diff --git a/cros_utils/device_setup_utils.py b/cros_utils/device_setup_utils.py index 33f934c9..29284a5c 100644 --- a/cros_utils/device_setup_utils.py +++ b/cros_utils/device_setup_utils.py @@ -9,9 +9,6 @@ This script provides utils to set device specs. """ -from __future__ import division -from __future__ import print_function - __author__ = "zhizhouy@google.com (Zhizhou Yang)" diff --git a/cros_utils/device_setup_utils_unittest.py b/cros_utils/device_setup_utils_unittest.py index 76775c4d..8fe99bcb 100755 --- a/cros_utils/device_setup_utils_unittest.py +++ b/cros_utils/device_setup_utils_unittest.py @@ -7,7 +7,6 @@ """Unittest for device_setup_utils.""" -from __future__ import print_function import time import unittest diff --git a/cros_utils/email_sender.py b/cros_utils/email_sender.py index 0572d2e1..259078b1 100755 --- a/cros_utils/email_sender.py +++ b/cros_utils/email_sender.py @@ -7,7 +7,6 @@ """Utilities to send email either through SMTP or SendGMR.""" -from __future__ import print_function import base64 import contextlib diff --git a/cros_utils/email_sender_unittest.py b/cros_utils/email_sender_unittest.py index 26b5b9a0..38711061 100755 --- a/cros_utils/email_sender_unittest.py +++ b/cros_utils/email_sender_unittest.py @@ -7,7 +7,6 @@ """Tests for email_sender.""" -from __future__ import print_function import contextlib import io diff --git a/cros_utils/file_utils.py b/cros_utils/file_utils.py index 23b3969b..0c5213b5 100644 --- a/cros_utils/file_utils.py +++ b/cros_utils/file_utils.py @@ -5,7 +5,6 @@ """Utilities for operations on files.""" -from __future__ import print_function import errno import os diff --git a/cros_utils/locks.py b/cros_utils/locks.py index b7eacd39..bd2242cf 100644 --- a/cros_utils/locks.py +++ b/cros_utils/locks.py @@ -6,7 +6,6 @@ """Utilities for locking machines.""" -from __future__ import print_function import time diff --git a/cros_utils/logger.py b/cros_utils/logger.py index bf50e01e..8ad9df58 100644 --- a/cros_utils/logger.py +++ b/cros_utils/logger.py @@ -5,7 +5,6 @@ """Logging helper module.""" -from __future__ import print_function # System modules import os.path diff --git a/cros_utils/machines.py b/cros_utils/machines.py index bdd1f322..b0a7134c 100644 --- a/cros_utils/machines.py +++ b/cros_utils/machines.py @@ -5,7 +5,6 @@ """Utilities relating to machine-specific functions.""" -from __future__ import print_function from cros_utils import command_executer diff --git a/cros_utils/misc.py b/cros_utils/misc.py index 0b44b994..02c8e051 100644 --- a/cros_utils/misc.py +++ b/cros_utils/misc.py @@ -5,9 +5,6 @@ """Utilities for toolchain build.""" -from __future__ import division -from __future__ import print_function - __author__ = "asharif@google.com (Ahmad Sharif)" diff --git a/cros_utils/misc_test.py b/cros_utils/misc_test.py index 9713ae10..c3c96996 100755 --- a/cros_utils/misc_test.py +++ b/cros_utils/misc_test.py @@ -6,8 +6,6 @@ """Tests for misc.""" -from __future__ import print_function - __author__ = "asharif@google.com (Ahmad Sharif)" diff --git a/cros_utils/no_pseudo_terminal_test.py b/cros_utils/no_pseudo_terminal_test.py index 1980d401..3cb35fac 100755 --- a/cros_utils/no_pseudo_terminal_test.py +++ b/cros_utils/no_pseudo_terminal_test.py @@ -7,7 +7,6 @@ """Test to ensure we're not touching /dev/ptmx when running commands.""" -from __future__ import print_function import os import subprocess diff --git a/cros_utils/perf_diff.py b/cros_utils/perf_diff.py index 191a6ee0..97e6e19d 100755 --- a/cros_utils/perf_diff.py +++ b/cros_utils/perf_diff.py @@ -9,8 +9,6 @@ A detailed description of perf_diff. """ -from __future__ import print_function - __author__ = "asharif@google.com (Ahmad Sharif)" diff --git a/cros_utils/tabulator.py b/cros_utils/tabulator.py index 7b51bf86..65d0cd42 100644 --- a/cros_utils/tabulator.py +++ b/cros_utils/tabulator.py @@ -61,8 +61,6 @@ table: print tp.Print() """ -from __future__ import division -from __future__ import print_function import collections import getpass diff --git a/cros_utils/tabulator_test.py b/cros_utils/tabulator_test.py index 5a5d909e..96d163e5 100755 --- a/cros_utils/tabulator_test.py +++ b/cros_utils/tabulator_test.py @@ -6,7 +6,6 @@ """Tests for the tabulator module.""" -from __future__ import print_function __author__ = 'asharif@google.com (Ahmad Sharif)' diff --git a/cros_utils/timeline.py b/cros_utils/timeline.py index d6d4cc0b..be8f9a06 100644 --- a/cros_utils/timeline.py +++ b/cros_utils/timeline.py @@ -5,8 +5,6 @@ """Tools for recording and reporting timeline of benchmark_run.""" -from __future__ import print_function - __author__ = "yunlian@google.com (Yunlian Jiang)" diff --git a/cros_utils/timeline_test.py b/cros_utils/timeline_test.py index 6743b986..9dc73d91 100755 --- a/cros_utils/timeline_test.py +++ b/cros_utils/timeline_test.py @@ -6,8 +6,6 @@ """Tests for time_line.py.""" -from __future__ import print_function - __author__ = "yunlian@google.com (Yunlian Jiang)" diff --git a/cros_utils/tiny_render.py b/cros_utils/tiny_render.py index 978bf05c..27891c20 100644 --- a/cros_utils/tiny_render.py +++ b/cros_utils/tiny_render.py @@ -51,7 +51,6 @@ Turns into The rendering functions should never mutate your input. """ -from __future__ import print_function import collections import html diff --git a/cros_utils/tiny_render_test.py b/cros_utils/tiny_render_test.py index 6534a9d7..8299093b 100755 --- a/cros_utils/tiny_render_test.py +++ b/cros_utils/tiny_render_test.py @@ -6,7 +6,6 @@ """Tests for tiny_render.""" -from __future__ import print_function import unittest diff --git a/crosperf/benchmark.py b/crosperf/benchmark.py index 473ab547..d7c62c54 100644 --- a/crosperf/benchmark.py +++ b/crosperf/benchmark.py @@ -5,8 +5,6 @@ """Define a type that wraps a Benchmark instance.""" -from __future__ import division -from __future__ import print_function import math diff --git a/crosperf/benchmark_run.py b/crosperf/benchmark_run.py index 79cfdd1c..a661d6a9 100644 --- a/crosperf/benchmark_run.py +++ b/crosperf/benchmark_run.py @@ -4,7 +4,6 @@ # found in the LICENSE file. """Module of benchmark runs.""" -from __future__ import print_function import datetime import threading diff --git a/crosperf/benchmark_run_unittest.py b/crosperf/benchmark_run_unittest.py index e59b275c..7113826a 100755 --- a/crosperf/benchmark_run_unittest.py +++ b/crosperf/benchmark_run_unittest.py @@ -7,7 +7,6 @@ """Testing of benchmark_run.""" -from __future__ import print_function import inspect import unittest diff --git a/crosperf/benchmark_unittest.py b/crosperf/benchmark_unittest.py index 31a95f25..bfa16841 100755 --- a/crosperf/benchmark_unittest.py +++ b/crosperf/benchmark_unittest.py @@ -7,7 +7,6 @@ """Unit tests for the Crosperf Benchmark class.""" -from __future__ import print_function import inspect import unittest diff --git a/crosperf/compare_machines.py b/crosperf/compare_machines.py index 338c039b..003a38ba 100644 --- a/crosperf/compare_machines.py +++ b/crosperf/compare_machines.py @@ -5,7 +5,6 @@ """Module to compare two machines.""" -from __future__ import print_function import argparse import os.path diff --git a/crosperf/config_unittest.py b/crosperf/config_unittest.py index 47387c71..df02786e 100755 --- a/crosperf/config_unittest.py +++ b/crosperf/config_unittest.py @@ -6,7 +6,6 @@ """Unit tests for config.py""" -from __future__ import print_function import unittest diff --git a/crosperf/crosperf.py b/crosperf/crosperf.py index 7ce78afd..813da415 100755 --- a/crosperf/crosperf.py +++ b/crosperf/crosperf.py @@ -6,7 +6,6 @@ """The driver script for running performance benchmarks on ChromeOS.""" -from __future__ import print_function import argparse import atexit diff --git a/crosperf/crosperf_unittest.py b/crosperf/crosperf_unittest.py index 4cbf71d8..88172ec6 100755 --- a/crosperf/crosperf_unittest.py +++ b/crosperf/crosperf_unittest.py @@ -7,8 +7,6 @@ """Unittest for crosperf.""" -from __future__ import division -from __future__ import print_function import argparse import io diff --git a/crosperf/download_images.py b/crosperf/download_images.py index da73d941..7dc52495 100644 --- a/crosperf/download_images.py +++ b/crosperf/download_images.py @@ -5,7 +5,6 @@ """Download images from Cloud Storage.""" -from __future__ import print_function import ast import os diff --git a/crosperf/download_images_buildid_test.py b/crosperf/download_images_buildid_test.py index b5063ed9..37868e0a 100755 --- a/crosperf/download_images_buildid_test.py +++ b/crosperf/download_images_buildid_test.py @@ -6,7 +6,6 @@ """Test translation of xbuddy names.""" -from __future__ import print_function import argparse import sys diff --git a/crosperf/download_images_unittest.py b/crosperf/download_images_unittest.py index 5206bd3d..8e8c6524 100755 --- a/crosperf/download_images_unittest.py +++ b/crosperf/download_images_unittest.py @@ -6,7 +6,6 @@ """Download image unittest.""" -from __future__ import print_function import os import unittest diff --git a/crosperf/experiment.py b/crosperf/experiment.py index cfd56b8f..28ab616b 100644 --- a/crosperf/experiment.py +++ b/crosperf/experiment.py @@ -5,7 +5,6 @@ """The experiment setting module.""" -from __future__ import print_function import os from threading import Lock diff --git a/crosperf/experiment_factory.py b/crosperf/experiment_factory.py index 9a89cb9c..a4265d41 100644 --- a/crosperf/experiment_factory.py +++ b/crosperf/experiment_factory.py @@ -5,7 +5,6 @@ """A module to generate experiments.""" -from __future__ import print_function import os import re diff --git a/crosperf/experiment_factory_unittest.py b/crosperf/experiment_factory_unittest.py index 115061e6..ffb8e579 100755 --- a/crosperf/experiment_factory_unittest.py +++ b/crosperf/experiment_factory_unittest.py @@ -7,7 +7,6 @@ """Unit test for experiment_factory.py""" -from __future__ import print_function import io import os diff --git a/crosperf/experiment_file.py b/crosperf/experiment_file.py index fbf16fe9..783a3224 100644 --- a/crosperf/experiment_file.py +++ b/crosperf/experiment_file.py @@ -5,7 +5,6 @@ """The experiment file module. It manages the input file of crosperf.""" -from __future__ import print_function import os.path import re diff --git a/crosperf/experiment_file_unittest.py b/crosperf/experiment_file_unittest.py index 90c70fb3..90ea87a6 100755 --- a/crosperf/experiment_file_unittest.py +++ b/crosperf/experiment_file_unittest.py @@ -6,7 +6,6 @@ # found in the LICENSE file. """The unittest of experiment_file.""" -from __future__ import print_function import io import unittest diff --git a/crosperf/experiment_runner.py b/crosperf/experiment_runner.py index c65917c3..1f1a90b2 100644 --- a/crosperf/experiment_runner.py +++ b/crosperf/experiment_runner.py @@ -4,7 +4,6 @@ # found in the LICENSE file. """The experiment runner module.""" -from __future__ import print_function import getpass import os diff --git a/crosperf/experiment_runner_unittest.py b/crosperf/experiment_runner_unittest.py index 241e1343..50ef1797 100755 --- a/crosperf/experiment_runner_unittest.py +++ b/crosperf/experiment_runner_unittest.py @@ -7,7 +7,6 @@ """Tests for the experiment runner module.""" -from __future__ import print_function import getpass import io diff --git a/crosperf/experiment_status.py b/crosperf/experiment_status.py index 4bd3995e..c76dfa24 100644 --- a/crosperf/experiment_status.py +++ b/crosperf/experiment_status.py @@ -5,8 +5,6 @@ """The class to show the banner.""" -from __future__ import division -from __future__ import print_function import collections import datetime diff --git a/crosperf/flag_test_unittest.py b/crosperf/flag_test_unittest.py index 1efc9167..7bb59515 100755 --- a/crosperf/flag_test_unittest.py +++ b/crosperf/flag_test_unittest.py @@ -6,7 +6,6 @@ """The unittest of flags.""" -from __future__ import print_function import unittest diff --git a/crosperf/generate_report.py b/crosperf/generate_report.py index 54cf4d91..186aba29 100755 --- a/crosperf/generate_report.py +++ b/crosperf/generate_report.py @@ -44,8 +44,6 @@ Peppy's runs took 1.321ms and 1.920ms, while peppy-new-crosstool's took 1.221ms and 1.423ms. None of the runs failed to complete. """ -from __future__ import division -from __future__ import print_function import argparse import functools diff --git a/crosperf/generate_report_unittest.py b/crosperf/generate_report_unittest.py index dbbd08f4..0d4ccf4f 100755 --- a/crosperf/generate_report_unittest.py +++ b/crosperf/generate_report_unittest.py @@ -6,8 +6,6 @@ """Test for generate_report.py.""" -from __future__ import division -from __future__ import print_function import copy import json diff --git a/crosperf/help.py b/crosperf/help.py index 660e2a4b..1f3c4f36 100644 --- a/crosperf/help.py +++ b/crosperf/help.py @@ -5,7 +5,6 @@ """Module to print help message.""" -from __future__ import print_function import sys import textwrap diff --git a/crosperf/image_checksummer.py b/crosperf/image_checksummer.py index 1fa25cfa..133a0576 100644 --- a/crosperf/image_checksummer.py +++ b/crosperf/image_checksummer.py @@ -5,7 +5,6 @@ """Compute image checksum.""" -from __future__ import print_function import os import threading diff --git a/crosperf/label.py b/crosperf/label.py index 0ce3957b..8785c037 100644 --- a/crosperf/label.py +++ b/crosperf/label.py @@ -5,7 +5,6 @@ """The label of benchamrks.""" -from __future__ import print_function import hashlib import os diff --git a/crosperf/machine_image_manager.py b/crosperf/machine_image_manager.py index 753ce0fe..c61d624e 100644 --- a/crosperf/machine_image_manager.py +++ b/crosperf/machine_image_manager.py @@ -5,7 +5,6 @@ """MachineImageManager allocates images to duts.""" -from __future__ import print_function import functools diff --git a/crosperf/machine_image_manager_unittest.py b/crosperf/machine_image_manager_unittest.py index e93a5646..dd557cdc 100755 --- a/crosperf/machine_image_manager_unittest.py +++ b/crosperf/machine_image_manager_unittest.py @@ -6,7 +6,6 @@ """Unit tests for the MachineImageManager class.""" -from __future__ import print_function import random import unittest diff --git a/crosperf/machine_manager.py b/crosperf/machine_manager.py index 5c8af75a..c780094b 100644 --- a/crosperf/machine_manager.py +++ b/crosperf/machine_manager.py @@ -5,8 +5,6 @@ """Machine Manager module.""" -from __future__ import division -from __future__ import print_function import collections import hashlib diff --git a/crosperf/machine_manager_unittest.py b/crosperf/machine_manager_unittest.py index 80b3dd11..5eed5e1f 100755 --- a/crosperf/machine_manager_unittest.py +++ b/crosperf/machine_manager_unittest.py @@ -7,7 +7,6 @@ """Unittest for machine_manager.""" -from __future__ import print_function import hashlib import os.path diff --git a/crosperf/mock_instance.py b/crosperf/mock_instance.py index a596662e..a0d581cd 100644 --- a/crosperf/mock_instance.py +++ b/crosperf/mock_instance.py @@ -5,7 +5,6 @@ """This contains some mock instances for testing.""" -from __future__ import print_function from benchmark import Benchmark from label import MockLabel diff --git a/crosperf/results_cache.py b/crosperf/results_cache.py index 3dd6839a..ca5966c0 100644 --- a/crosperf/results_cache.py +++ b/crosperf/results_cache.py @@ -5,8 +5,6 @@ """Module to deal with result cache.""" -from __future__ import division -from __future__ import print_function import collections import glob diff --git a/crosperf/results_cache_unittest.py b/crosperf/results_cache_unittest.py index dbf5d672..8029161a 100755 --- a/crosperf/results_cache_unittest.py +++ b/crosperf/results_cache_unittest.py @@ -7,7 +7,6 @@ """Module of result cache unittest.""" -from __future__ import print_function import io import os diff --git a/crosperf/results_organizer.py b/crosperf/results_organizer.py index 59ac685b..a3701ab7 100644 --- a/crosperf/results_organizer.py +++ b/crosperf/results_organizer.py @@ -5,7 +5,6 @@ """Parse data from benchmark_runs for tabulator.""" -from __future__ import print_function import errno import json diff --git a/crosperf/results_organizer_unittest.py b/crosperf/results_organizer_unittest.py index 90a95a73..707f89f7 100755 --- a/crosperf/results_organizer_unittest.py +++ b/crosperf/results_organizer_unittest.py @@ -11,7 +11,6 @@ after that, we compare the result of ResultOrganizer. """ -from __future__ import print_function import unittest diff --git a/crosperf/results_report.py b/crosperf/results_report.py index 50412086..735e1a34 100644 --- a/crosperf/results_report.py +++ b/crosperf/results_report.py @@ -4,7 +4,6 @@ # found in the LICENSE file. """A module to handle the report format.""" -from __future__ import print_function import datetime import functools diff --git a/crosperf/results_report_templates.py b/crosperf/results_report_templates.py index ec87ac41..e88fd9c7 100644 --- a/crosperf/results_report_templates.py +++ b/crosperf/results_report_templates.py @@ -4,7 +4,6 @@ # found in the LICENSE file. """Text templates used by various parts of results_report.""" -from __future__ import print_function import html from string import Template diff --git a/crosperf/results_report_unittest.py b/crosperf/results_report_unittest.py index ef073a71..3c1d6663 100755 --- a/crosperf/results_report_unittest.py +++ b/crosperf/results_report_unittest.py @@ -7,8 +7,6 @@ """Unittest for the results reporter.""" -from __future__ import division -from __future__ import print_function import collections import io diff --git a/crosperf/schedv2.py b/crosperf/schedv2.py index 692f3420..c611cbcf 100644 --- a/crosperf/schedv2.py +++ b/crosperf/schedv2.py @@ -5,8 +5,6 @@ """Module to optimize the scheduling of benchmark_run tasks.""" -from __future__ import division -from __future__ import print_function from collections import defaultdict import sys diff --git a/crosperf/schedv2_unittest.py b/crosperf/schedv2_unittest.py index e939bc5b..c79c6ecd 100755 --- a/crosperf/schedv2_unittest.py +++ b/crosperf/schedv2_unittest.py @@ -7,7 +7,6 @@ """This contains the unit tests for the new Crosperf task scheduler.""" -from __future__ import print_function import functools import io diff --git a/crosperf/settings.py b/crosperf/settings.py index 5ea25927..5488a5b0 100644 --- a/crosperf/settings.py +++ b/crosperf/settings.py @@ -5,7 +5,6 @@ """Module to get the settings from experiment file.""" -from __future__ import print_function from cros_utils import logger from cros_utils import misc diff --git a/crosperf/settings_factory.py b/crosperf/settings_factory.py index b91156dc..469d2260 100644 --- a/crosperf/settings_factory.py +++ b/crosperf/settings_factory.py @@ -5,7 +5,6 @@ """Setting files for global, benchmark and labels.""" -from __future__ import print_function from field import BooleanField from field import EnumField diff --git a/crosperf/settings_factory_unittest.py b/crosperf/settings_factory_unittest.py index 031a0e65..b8487b96 100755 --- a/crosperf/settings_factory_unittest.py +++ b/crosperf/settings_factory_unittest.py @@ -7,7 +7,6 @@ """Unittest for crosperf.""" -from __future__ import print_function import unittest diff --git a/crosperf/settings_unittest.py b/crosperf/settings_unittest.py index 0128c33e..75913a09 100755 --- a/crosperf/settings_unittest.py +++ b/crosperf/settings_unittest.py @@ -6,7 +6,6 @@ """unittest for settings.""" -from __future__ import print_function import unittest import unittest.mock as mock diff --git a/crosperf/suite_runner.py b/crosperf/suite_runner.py index b3c5879d..f5c4d2c7 100644 --- a/crosperf/suite_runner.py +++ b/crosperf/suite_runner.py @@ -5,8 +5,6 @@ """SuiteRunner defines the interface from crosperf to test script.""" -from __future__ import division -from __future__ import print_function import json import os diff --git a/crosperf/suite_runner_unittest.py b/crosperf/suite_runner_unittest.py index a97e1638..a1ab660f 100755 --- a/crosperf/suite_runner_unittest.py +++ b/crosperf/suite_runner_unittest.py @@ -7,7 +7,6 @@ """Unittest for suite_runner.""" -from __future__ import print_function import json import unittest diff --git a/crosperf/translate_xbuddy.py b/crosperf/translate_xbuddy.py index eb28ecae..2ae60af4 100755 --- a/crosperf/translate_xbuddy.py +++ b/crosperf/translate_xbuddy.py @@ -6,7 +6,6 @@ """Module to translate the xbuddy config.""" -from __future__ import print_function import os import sys diff --git a/cwp/cr-os/fetch_gn_descs.py b/cwp/cr-os/fetch_gn_descs.py index 220511bf..a9cbdb55 100755 --- a/cwp/cr-os/fetch_gn_descs.py +++ b/cwp/cr-os/fetch_gn_descs.py @@ -19,7 +19,6 @@ The result is of the form: } """ -from __future__ import print_function import argparse import json diff --git a/cwp/cr-os/fetch_gn_descs_test.py b/cwp/cr-os/fetch_gn_descs_test.py index f9a9cf93..a42cb2e9 100755 --- a/cwp/cr-os/fetch_gn_descs_test.py +++ b/cwp/cr-os/fetch_gn_descs_test.py @@ -6,7 +6,6 @@ """Tests for fetch_gn_descs.py.""" -from __future__ import print_function import io import unittest diff --git a/debug_info_test/allowlist.py b/debug_info_test/allowlist.py index 945c0440..3cccf293 100644 --- a/debug_info_test/allowlist.py +++ b/debug_info_test/allowlist.py @@ -5,7 +5,6 @@ """Allowlist functions.""" -from __future__ import print_function import glob import os diff --git a/debug_info_test/check_cus.py b/debug_info_test/check_cus.py index df2c4275..b2458e94 100644 --- a/debug_info_test/check_cus.py +++ b/debug_info_test/check_cus.py @@ -5,7 +5,6 @@ """check compile units.""" -from __future__ import print_function import os import subprocess diff --git a/debug_info_test/check_exist.py b/debug_info_test/check_exist.py index 795cb470..d51abe42 100644 --- a/debug_info_test/check_exist.py +++ b/debug_info_test/check_exist.py @@ -5,7 +5,6 @@ """check whether intended components exists in the given dso.""" -from __future__ import print_function import os import subprocess diff --git a/debug_info_test/check_icf.py b/debug_info_test/check_icf.py index 5e92ec13..8eca39a2 100644 --- a/debug_info_test/check_icf.py +++ b/debug_info_test/check_icf.py @@ -5,7 +5,6 @@ """check whether chrome was built with identical code folding.""" -from __future__ import print_function import os import re diff --git a/debug_info_test/check_ngcc.py b/debug_info_test/check_ngcc.py index 60508691..348fcc8a 100644 --- a/debug_info_test/check_ngcc.py +++ b/debug_info_test/check_ngcc.py @@ -5,7 +5,6 @@ """Check whether the compile unit is not built by gcc.""" -from __future__ import print_function from allowlist import is_allowlisted diff --git a/debug_info_test/debug_info_test.py b/debug_info_test/debug_info_test.py index ab123e0b..057921aa 100755 --- a/debug_info_test/debug_info_test.py +++ b/debug_info_test/debug_info_test.py @@ -6,7 +6,6 @@ """Test for debug info.""" -from __future__ import print_function import os import subprocess diff --git a/file_lock_machine.py b/file_lock_machine.py index 72d6233a..2b281ff7 100755 --- a/file_lock_machine.py +++ b/file_lock_machine.py @@ -6,9 +6,6 @@ """Script to lock/unlock machines.""" -from __future__ import division -from __future__ import print_function - __author__ = "asharif@google.com (Ahmad Sharif)" diff --git a/file_lock_machine_test.py b/file_lock_machine_test.py index d1189512..d59f7e28 100755 --- a/file_lock_machine_test.py +++ b/file_lock_machine_test.py @@ -10,8 +10,6 @@ MachineManagerTest tests MachineManager. """ -from __future__ import print_function - __author__ = "asharif@google.com (Ahmad Sharif)" diff --git a/go/chromeos/setup_chromeos_testing.py b/go/chromeos/setup_chromeos_testing.py index 53254a99..863cf8c8 100755 --- a/go/chromeos/setup_chromeos_testing.py +++ b/go/chromeos/setup_chromeos_testing.py @@ -6,7 +6,6 @@ """Generate board-specific scripts for Go compiler testing.""" -from __future__ import print_function import argparse import getpass diff --git a/heatmaps/heat_map.py b/heatmaps/heat_map.py index c4e43fdc..78ee8cba 100755 --- a/heatmaps/heat_map.py +++ b/heatmaps/heat_map.py @@ -6,7 +6,6 @@ """Wrapper to generate heat maps for chrome.""" -from __future__ import print_function import argparse import os diff --git a/heatmaps/heat_map_test.py b/heatmaps/heat_map_test.py index 0d3ca4e2..2b86363b 100755 --- a/heatmaps/heat_map_test.py +++ b/heatmaps/heat_map_test.py @@ -7,7 +7,6 @@ """Tests for heat_map.py.""" -from __future__ import print_function import os import unittest diff --git a/heatmaps/heatmap_generator.py b/heatmaps/heatmap_generator.py index c139c364..768a4e40 100644 --- a/heatmaps/heatmap_generator.py +++ b/heatmaps/heatmap_generator.py @@ -13,8 +13,6 @@ performed by another script perf-to-inst-page.sh). It can also analyze the symbol names in hot pages. """ -from __future__ import division -from __future__ import print_function import bisect import collections diff --git a/heatmaps/heatmap_generator_test.py b/heatmaps/heatmap_generator_test.py index 4afc9351..fbace10a 100755 --- a/heatmaps/heatmap_generator_test.py +++ b/heatmaps/heatmap_generator_test.py @@ -6,8 +6,6 @@ """Tests for heatmap_generator.py.""" -from __future__ import division -from __future__ import print_function import os import unittest diff --git a/image_chromeos.py b/image_chromeos.py index 150c7de0..5922a241 100755 --- a/image_chromeos.py +++ b/image_chromeos.py @@ -10,8 +10,6 @@ This script images a remote ChromeOS device with a specific image." """ -from __future__ import print_function - __author__ = "asharif@google.com (Ahmad Sharif)" diff --git a/llvm_extra/create_ebuild_file.py b/llvm_extra/create_ebuild_file.py index d974d50c..4abd466a 100755 --- a/llvm_extra/create_ebuild_file.py +++ b/llvm_extra/create_ebuild_file.py @@ -90,7 +90,6 @@ diff -Nuar llvm-pre7.0_pre335547_p20180529.ebuild newly-created-file.ebuild # some users may find it useful """ -from __future__ import print_function import os import sys diff --git a/llvm_tools/auto_llvm_bisection.py b/llvm_tools/auto_llvm_bisection.py index b9d04d1d..0dcd6bad 100755 --- a/llvm_tools/auto_llvm_bisection.py +++ b/llvm_tools/auto_llvm_bisection.py @@ -6,7 +6,6 @@ """Performs bisection on LLVM based off a .JSON file.""" -from __future__ import print_function import enum import json diff --git a/llvm_tools/auto_llvm_bisection_unittest.py b/llvm_tools/auto_llvm_bisection_unittest.py index 9d0654cf..ef82453b 100755 --- a/llvm_tools/auto_llvm_bisection_unittest.py +++ b/llvm_tools/auto_llvm_bisection_unittest.py @@ -6,7 +6,6 @@ """Tests for auto bisection of LLVM.""" -from __future__ import print_function import json import os diff --git a/llvm_tools/chroot.py b/llvm_tools/chroot.py index 3a3bdde4..73ab9203 100755 --- a/llvm_tools/chroot.py +++ b/llvm_tools/chroot.py @@ -6,7 +6,6 @@ """Chroot helper functions.""" -from __future__ import print_function import collections import os diff --git a/llvm_tools/chroot_unittest.py b/llvm_tools/chroot_unittest.py index 0e7d133c..39877aa5 100755 --- a/llvm_tools/chroot_unittest.py +++ b/llvm_tools/chroot_unittest.py @@ -6,7 +6,6 @@ """Unit tests for chroot helper functions.""" -from __future__ import print_function import subprocess import unittest diff --git a/llvm_tools/copy_helpers_to_chromiumos_overlay.py b/llvm_tools/copy_helpers_to_chromiumos_overlay.py index 042b19fa..758c7533 100755 --- a/llvm_tools/copy_helpers_to_chromiumos_overlay.py +++ b/llvm_tools/copy_helpers_to_chromiumos_overlay.py @@ -11,7 +11,6 @@ patch_manager ones). This script simplifies the copying of those around. """ # Necessary until crbug.com/1006448 is fixed -from __future__ import print_function import argparse import os diff --git a/llvm_tools/custom_script_example.py b/llvm_tools/custom_script_example.py index 4b90e88b..ebfde1f1 100755 --- a/llvm_tools/custom_script_example.py +++ b/llvm_tools/custom_script_example.py @@ -6,7 +6,6 @@ """A custom script example that utilizes the .JSON contents of the tryjob.""" -from __future__ import print_function import json import sys diff --git a/llvm_tools/failure_modes.py b/llvm_tools/failure_modes.py index f043b1ec..098a0270 100644 --- a/llvm_tools/failure_modes.py +++ b/llvm_tools/failure_modes.py @@ -5,7 +5,6 @@ """Failure mode constants avaiable to the patch manager.""" -from __future__ import print_function import enum diff --git a/llvm_tools/get_llvm_hash.py b/llvm_tools/get_llvm_hash.py index 9c0a5020..77efccbe 100755 --- a/llvm_tools/get_llvm_hash.py +++ b/llvm_tools/get_llvm_hash.py @@ -6,7 +6,6 @@ """Returns the latest LLVM version's hash.""" -from __future__ import print_function import argparse import contextlib diff --git a/llvm_tools/get_llvm_hash_unittest.py b/llvm_tools/get_llvm_hash_unittest.py index 32fb5b53..fc13bc17 100755 --- a/llvm_tools/get_llvm_hash_unittest.py +++ b/llvm_tools/get_llvm_hash_unittest.py @@ -6,7 +6,6 @@ """Unit tests for retrieving the LLVM hash.""" -from __future__ import print_function import subprocess import unittest diff --git a/llvm_tools/git.py b/llvm_tools/git.py index 0fe4cb63..2bb43c29 100755 --- a/llvm_tools/git.py +++ b/llvm_tools/git.py @@ -6,7 +6,6 @@ """Git helper functions.""" -from __future__ import print_function import collections import os diff --git a/llvm_tools/git_llvm_rev.py b/llvm_tools/git_llvm_rev.py index 283a3920..44a6426e 100755 --- a/llvm_tools/git_llvm_rev.py +++ b/llvm_tools/git_llvm_rev.py @@ -10,7 +10,6 @@ Revision numbers are all of the form '(branch_name, r1234)'. As a shorthand, r1234 is parsed as '(main, 1234)'. """ -from __future__ import print_function import argparse import re diff --git a/llvm_tools/git_unittest.py b/llvm_tools/git_unittest.py index 8e75100f..cf4035ff 100755 --- a/llvm_tools/git_unittest.py +++ b/llvm_tools/git_unittest.py @@ -6,7 +6,6 @@ """Unit tests for git helper functions.""" -from __future__ import print_function import os import subprocess diff --git a/llvm_tools/llvm_bisection.py b/llvm_tools/llvm_bisection.py index f268bfb1..e6f0e2c9 100755 --- a/llvm_tools/llvm_bisection.py +++ b/llvm_tools/llvm_bisection.py @@ -6,7 +6,6 @@ """Performs bisection on LLVM based off a .JSON file.""" -from __future__ import print_function import argparse import enum diff --git a/llvm_tools/llvm_bisection_unittest.py b/llvm_tools/llvm_bisection_unittest.py index 0dfdef54..e047be41 100755 --- a/llvm_tools/llvm_bisection_unittest.py +++ b/llvm_tools/llvm_bisection_unittest.py @@ -8,7 +8,6 @@ """Tests for LLVM bisection.""" -from __future__ import print_function import json import os diff --git a/llvm_tools/llvm_project.py b/llvm_tools/llvm_project.py index 85b4a0c2..45539596 100644 --- a/llvm_tools/llvm_project.py +++ b/llvm_tools/llvm_project.py @@ -5,7 +5,6 @@ """Module for manipulating llvm-project-copy. Generally intended for tests.""" -from __future__ import print_function import datetime import os diff --git a/llvm_tools/modify_a_tryjob.py b/llvm_tools/modify_a_tryjob.py index 6ef12008..79f999b1 100755 --- a/llvm_tools/modify_a_tryjob.py +++ b/llvm_tools/modify_a_tryjob.py @@ -6,7 +6,6 @@ """Modifies a tryjob based off of arguments.""" -from __future__ import print_function import argparse import enum diff --git a/llvm_tools/modify_a_tryjob_unittest.py b/llvm_tools/modify_a_tryjob_unittest.py index 38ebccad..6ae29c5f 100755 --- a/llvm_tools/modify_a_tryjob_unittest.py +++ b/llvm_tools/modify_a_tryjob_unittest.py @@ -6,7 +6,6 @@ """Tests for modifying a tryjob.""" -from __future__ import print_function import json import unittest diff --git a/llvm_tools/nightly_revert_checker.py b/llvm_tools/nightly_revert_checker.py index 17b1c40f..78a85f90 100755 --- a/llvm_tools/nightly_revert_checker.py +++ b/llvm_tools/nightly_revert_checker.py @@ -10,7 +10,6 @@ If any reverts are found that were previously unknown, this cherry-picks them or fires off an email. All LLVM SHAs to monitor are autodetected. """ -from __future__ import print_function import argparse import io diff --git a/llvm_tools/nightly_revert_checker_test.py b/llvm_tools/nightly_revert_checker_test.py index 2064cf96..694d3d80 100755 --- a/llvm_tools/nightly_revert_checker_test.py +++ b/llvm_tools/nightly_revert_checker_test.py @@ -6,7 +6,6 @@ """Tests for nightly_revert_checker.""" -from __future__ import print_function import io import unittest diff --git a/llvm_tools/subprocess_helpers.py b/llvm_tools/subprocess_helpers.py index d4f545d2..c295cbb8 100644 --- a/llvm_tools/subprocess_helpers.py +++ b/llvm_tools/subprocess_helpers.py @@ -5,7 +5,6 @@ """Helpers/wrappers for the subprocess module for migration to python3.""" -from __future__ import print_function import subprocess diff --git a/llvm_tools/test_helpers.py b/llvm_tools/test_helpers.py index 2391a48c..48a8e8c1 100644 --- a/llvm_tools/test_helpers.py +++ b/llvm_tools/test_helpers.py @@ -5,7 +5,6 @@ """Helper functions for unit testing.""" -from __future__ import print_function from contextlib import contextmanager import json diff --git a/llvm_tools/update_chromeos_llvm_hash_unittest.py b/llvm_tools/update_chromeos_llvm_hash_unittest.py index c361334a..591890e6 100755 --- a/llvm_tools/update_chromeos_llvm_hash_unittest.py +++ b/llvm_tools/update_chromeos_llvm_hash_unittest.py @@ -6,7 +6,6 @@ """Unit tests for updating LLVM hashes.""" -from __future__ import print_function import collections import datetime diff --git a/llvm_tools/update_packages_and_run_tests.py b/llvm_tools/update_packages_and_run_tests.py index 5d004546..cc96ec53 100755 --- a/llvm_tools/update_packages_and_run_tests.py +++ b/llvm_tools/update_packages_and_run_tests.py @@ -6,7 +6,6 @@ """Runs a tryjob/tryjobs after updating the packages.""" -from __future__ import print_function import argparse import datetime diff --git a/llvm_tools/update_packages_and_run_tests_unittest.py b/llvm_tools/update_packages_and_run_tests_unittest.py index 0b029e04..cff28672 100755 --- a/llvm_tools/update_packages_and_run_tests_unittest.py +++ b/llvm_tools/update_packages_and_run_tests_unittest.py @@ -6,7 +6,6 @@ """Unittests for running tests after updating packages.""" -from __future__ import print_function import json import subprocess diff --git a/llvm_tools/update_tryjob_status.py b/llvm_tools/update_tryjob_status.py index ea7fe9c0..4c72403d 100755 --- a/llvm_tools/update_tryjob_status.py +++ b/llvm_tools/update_tryjob_status.py @@ -6,7 +6,6 @@ """Updates the status of a tryjob.""" -from __future__ import print_function import argparse import enum diff --git a/llvm_tools/update_tryjob_status_unittest.py b/llvm_tools/update_tryjob_status_unittest.py index b6fc59c8..e73cb281 100755 --- a/llvm_tools/update_tryjob_status_unittest.py +++ b/llvm_tools/update_tryjob_status_unittest.py @@ -6,7 +6,6 @@ """Tests when updating a tryjob's status.""" -from __future__ import print_function import json import os diff --git a/lock_machine.py b/lock_machine.py index 030d7d45..e7befdb2 100755 --- a/lock_machine.py +++ b/lock_machine.py @@ -7,7 +7,6 @@ """This module controls locking and unlocking of test machines.""" -from __future__ import print_function import argparse import enum diff --git a/make_root_writable.py b/make_root_writable.py index 500f8fe5..297a9150 100755 --- a/make_root_writable.py +++ b/make_root_writable.py @@ -10,8 +10,6 @@ This script updates a remote chromebook to make the / directory writable." """ -from __future__ import print_function - __author__ = "cmtice@google.com (Caroline Tice)" diff --git a/orderfile/post_process_orderfile.py b/orderfile/post_process_orderfile.py index 5d98756b..4f61c19f 100755 --- a/orderfile/post_process_orderfile.py +++ b/orderfile/post_process_orderfile.py @@ -19,8 +19,6 @@ The results of the file is intended to be uploaded and consumed when linking Chrome in ChromeOS. """ -from __future__ import division -from __future__ import print_function import argparse import os diff --git a/orderfile/post_process_orderfile_test.py b/orderfile/post_process_orderfile_test.py index 4eb36699..d7ee3f8b 100755 --- a/orderfile/post_process_orderfile_test.py +++ b/orderfile/post_process_orderfile_test.py @@ -6,8 +6,6 @@ """Tests for post_process_orderfile.py.""" -from __future__ import division -from __future__ import print_function import os import shutil diff --git a/pgo_tools/merge_profdata_and_upload.py b/pgo_tools/merge_profdata_and_upload.py index 768a1a57..efc986f4 100755 --- a/pgo_tools/merge_profdata_and_upload.py +++ b/pgo_tools/merge_profdata_and_upload.py @@ -35,7 +35,6 @@ In this example, the script will merge profdata from arm and amd64 builder, and profdata from an arm64 buildbucket task. """ -from __future__ import print_function import argparse import collections diff --git a/remote_test.py b/remote_test.py index 574d6762..c3c88b5c 100755 --- a/remote_test.py +++ b/remote_test.py @@ -10,8 +10,6 @@ This script can login to the chromeos machine using the test private key. """ -from __future__ import print_function - __author__ = "asharif@google.com (Ahmad Sharif)" diff --git a/run_tests_for.py b/run_tests_for.py index 93d48984..a8ad1674 100755 --- a/run_tests_for.py +++ b/run_tests_for.py @@ -24,7 +24,6 @@ All tests are run in parallel. # of the chroot a bit more obnoxious?), but might be worth exploring if this # starts to grow quite complex on its own. -from __future__ import print_function import argparse import collections diff --git a/tc_enter_chroot.py b/tc_enter_chroot.py index 0dcadb07..c746a0a2 100755 --- a/tc_enter_chroot.py +++ b/tc_enter_chroot.py @@ -9,8 +9,6 @@ This script enters the chroot with mounted sources. """ -from __future__ import print_function - __author__ = "asharif@google.com (Ahmad Sharif)" diff --git a/update_telemetry_defaults.py b/update_telemetry_defaults.py index 88420b64..a3feb6a0 100755 --- a/update_telemetry_defaults.py +++ b/update_telemetry_defaults.py @@ -11,8 +11,6 @@ results to be used in generating reports from running the Telemetry benchmarks. """ -from __future__ import print_function - __author__ = "cmtice@google.com (Caroline Tice)" -- cgit v1.2.3