diff options
| author | George Burgess IV <gbiv@google.com> | 2022-09-06 12:12:02 -0700 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-09-07 21:15:10 +0000 |
| commit | c0041a9550814e402f661a560855ff99863cffb2 (patch) | |
| tree | 0ee1cc2f9680930fd230868df063fb0f38423623 /crosperf | |
| parent | 84556973468631cce626a9cebb7b23439afa763e (diff) | |
| download | toolchain-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 'crosperf')
46 files changed, 0 insertions, 56 deletions
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 |