diff --git a/tools/lint/fnmatch.py b/tools/lint/fnmatch.py index 0c45029b23915f..143cb436f2cb5e 100644 --- a/tools/lint/fnmatch.py +++ b/tools/lint/fnmatch.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import fnmatch as _stdlib_fnmatch import os diff --git a/tools/lint/lint.py b/tools/lint/lint.py index 51fe3beb08db65..f8f1e88b1b31e1 100644 --- a/tools/lint/lint.py +++ b/tools/lint/lint.py @@ -1,5 +1,3 @@ -from __future__ import print_function, unicode_literals - import abc import argparse import ast diff --git a/tools/lint/rules.py b/tools/lint/rules.py index 125adb07d7f884..d2aa20f598f40f 100644 --- a/tools/lint/rules.py +++ b/tools/lint/rules.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import abc import inspect import os diff --git a/tools/lint/tests/base.py b/tools/lint/tests/base.py index 36c16676d52980..ea7c331b8e6e66 100644 --- a/tools/lint/tests/base.py +++ b/tools/lint/tests/base.py @@ -1,6 +1,3 @@ -from __future__ import unicode_literals - - def check_errors(errors): for e in errors: error_type, description, path, line_number = e diff --git a/tools/lint/tests/test_path_lints.py b/tools/lint/tests/test_path_lints.py index 3706a952c61f6a..d9da56de473530 100644 --- a/tools/lint/tests/test_path_lints.py +++ b/tools/lint/tests/test_path_lints.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import mock import os diff --git a/tools/manifest/download.py b/tools/manifest/download.py index 0cfbf4934273cc..c45cc787251b29 100644 --- a/tools/manifest/download.py +++ b/tools/manifest/download.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import argparse import bz2 import gzip diff --git a/tools/runner/report.py b/tools/runner/report.py index c22994ced00eff..db4c9888ff7012 100644 --- a/tools/runner/report.py +++ b/tools/runner/report.py @@ -1,7 +1,5 @@ # flake8: noqa -from __future__ import print_function - import argparse import json import sys diff --git a/tools/serve/serve.py b/tools/serve/serve.py index 4694d4364b1d87..2c57b72a9f8d97 100644 --- a/tools/serve/serve.py +++ b/tools/serve/serve.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import print_function - import abc import argparse import importlib diff --git a/tools/wave/configuration_loader.py b/tools/wave/configuration_loader.py index dbee6eac277cf3..819b414cfaac48 100644 --- a/tools/wave/configuration_loader.py +++ b/tools/wave/configuration_loader.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals import json import os diff --git a/tools/wave/data/session.py b/tools/wave/data/session.py index df162fcb082e7f..a4477f66decc42 100644 --- a/tools/wave/data/session.py +++ b/tools/wave/data/session.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals from ..testing.test_loader import MANUAL, AUTOMATIC PAUSED = "paused" diff --git a/tools/wave/network/api/results_api_handler.py b/tools/wave/network/api/results_api_handler.py index c52eee56ada3fe..7e23238a8c272f 100644 --- a/tools/wave/network/api/results_api_handler.py +++ b/tools/wave/network/api/results_api_handler.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals import json from .api_handler import ApiHandler diff --git a/tools/wave/network/api/sessions_api_handler.py b/tools/wave/network/api/sessions_api_handler.py index b6484566730209..c5040addf70d87 100644 --- a/tools/wave/network/api/sessions_api_handler.py +++ b/tools/wave/network/api/sessions_api_handler.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals import json import threading diff --git a/tools/wave/network/static_handler.py b/tools/wave/network/static_handler.py index 2334a095906165..6f8af430604c45 100644 --- a/tools/wave/network/static_handler.py +++ b/tools/wave/network/static_handler.py @@ -1,6 +1,3 @@ -from __future__ import with_statement -from __future__ import absolute_import -from __future__ import unicode_literals import os diff --git a/tools/wave/testing/event_dispatcher.py b/tools/wave/testing/event_dispatcher.py index 9540df02036ad0..bb578d1c6838d2 100644 --- a/tools/wave/testing/event_dispatcher.py +++ b/tools/wave/testing/event_dispatcher.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - STATUS_EVENT = "status" RESUME_EVENT = "resume" TEST_COMPLETED_EVENT = "test_completed" diff --git a/tools/wave/testing/results_manager.py b/tools/wave/testing/results_manager.py index aae1900d34a6fc..e37304168f81ac 100644 --- a/tools/wave/testing/results_manager.py +++ b/tools/wave/testing/results_manager.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals import os import shutil import re diff --git a/tools/wave/testing/sessions_manager.py b/tools/wave/testing/sessions_manager.py index a00623c928fceb..b552ac6f2e0462 100644 --- a/tools/wave/testing/sessions_manager.py +++ b/tools/wave/testing/sessions_manager.py @@ -1,6 +1,3 @@ -from __future__ import division -from __future__ import absolute_import -from __future__ import unicode_literals import uuid import time import os diff --git a/tools/wave/testing/test_loader.py b/tools/wave/testing/test_loader.py index ce48639fc03d1c..555f0012d379ec 100644 --- a/tools/wave/testing/test_loader.py +++ b/tools/wave/testing/test_loader.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals import os import re diff --git a/tools/wave/testing/tests_manager.py b/tools/wave/testing/tests_manager.py index aa8b919a9fc303..973505159b5618 100644 --- a/tools/wave/testing/tests_manager.py +++ b/tools/wave/testing/tests_manager.py @@ -1,6 +1,3 @@ -from __future__ import division -from __future__ import absolute_import -from __future__ import unicode_literals import re from threading import Timer diff --git a/tools/wave/testing/wpt_report.py b/tools/wave/testing/wpt_report.py index e10de774458619..8568954e5b57d9 100644 --- a/tools/wave/testing/wpt_report.py +++ b/tools/wave/testing/wpt_report.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals import subprocess import os import ntpath diff --git a/tools/wave/utils/deserializer.py b/tools/wave/utils/deserializer.py index b8a3608356695b..36508bf36557ef 100644 --- a/tools/wave/utils/deserializer.py +++ b/tools/wave/utils/deserializer.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals from ..data.session import Session, UNKNOWN diff --git a/tools/wave/utils/serializer.py b/tools/wave/utils/serializer.py index 66571738b48194..2adceb0b6de4ff 100644 --- a/tools/wave/utils/serializer.py +++ b/tools/wave/utils/serializer.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - def serialize_session(session): return { "token": session.token, diff --git a/tools/wave/utils/user_agent_parser.py b/tools/wave/utils/user_agent_parser.py index 7c0727e1f3cd84..ac7e101958743c 100644 --- a/tools/wave/utils/user_agent_parser.py +++ b/tools/wave/utils/user_agent_parser.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals from ua_parser import user_agent_parser diff --git a/tools/wave/wave_server.py b/tools/wave/wave_server.py index cdbb9c3a6756d1..bc33bfdc631365 100644 --- a/tools/wave/wave_server.py +++ b/tools/wave/wave_server.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals import os import logging diff --git a/tools/wptrunner/setup.py b/tools/wptrunner/setup.py index a459e2c4714104..c20955848dbffe 100644 --- a/tools/wptrunner/setup.py +++ b/tools/wptrunner/setup.py @@ -2,8 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -from __future__ import print_function - import glob import os import sys diff --git a/tools/wptrunner/wptrunner/browsers/edge.py b/tools/wptrunner/wptrunner/browsers/edge.py index 6b353069675669..3101e9c7bea38a 100644 --- a/tools/wptrunner/wptrunner/browsers/edge.py +++ b/tools/wptrunner/wptrunner/browsers/edge.py @@ -1,4 +1,3 @@ -from __future__ import print_function import time import subprocess from .base import Browser, ExecutorBrowser, require_arg diff --git a/tools/wptrunner/wptrunner/executors/executorselenium.py b/tools/wptrunner/wptrunner/executors/executorselenium.py index 783903b9bbe4a4..9d675cb3ef8723 100644 --- a/tools/wptrunner/wptrunner/executors/executorselenium.py +++ b/tools/wptrunner/wptrunner/executors/executorselenium.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import json import os import socket diff --git a/tools/wptrunner/wptrunner/executors/executorservo.py b/tools/wptrunner/wptrunner/executors/executorservo.py index 23ff4a7db2991f..f322421bd3fa89 100644 --- a/tools/wptrunner/wptrunner/executors/executorservo.py +++ b/tools/wptrunner/wptrunner/executors/executorservo.py @@ -1,4 +1,3 @@ -from __future__ import print_function import base64 import json import os diff --git a/tools/wptrunner/wptrunner/executors/executorwebdriver.py b/tools/wptrunner/wptrunner/executors/executorwebdriver.py index a04a55a6f00c18..d20f7dd2daf35e 100644 --- a/tools/wptrunner/wptrunner/executors/executorwebdriver.py +++ b/tools/wptrunner/wptrunner/executors/executorwebdriver.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import json import os import socket diff --git a/tools/wptrunner/wptrunner/manifestupdate.py b/tools/wptrunner/wptrunner/manifestupdate.py index 2fc42997273e03..ad59c0d3edd9c7 100644 --- a/tools/wptrunner/wptrunner/manifestupdate.py +++ b/tools/wptrunner/wptrunner/manifestupdate.py @@ -1,4 +1,3 @@ -from __future__ import print_function import os from urllib.parse import urljoin, urlsplit from collections import namedtuple, defaultdict, deque diff --git a/tools/wptrunner/wptrunner/metadata.py b/tools/wptrunner/wptrunner/metadata.py index 27bdb392a66901..9c54e570c01bbd 100644 --- a/tools/wptrunner/wptrunner/metadata.py +++ b/tools/wptrunner/wptrunner/metadata.py @@ -1,4 +1,3 @@ -from __future__ import print_function import array import os from collections import defaultdict, namedtuple diff --git a/tools/wptrunner/wptrunner/testrunner.py b/tools/wptrunner/wptrunner/testrunner.py index 4258aa6a35fecb..4bc978e880e9d4 100644 --- a/tools/wptrunner/wptrunner/testrunner.py +++ b/tools/wptrunner/wptrunner/testrunner.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import threading import traceback from queue import Empty diff --git a/tools/wptrunner/wptrunner/tests/test_testloader.py b/tools/wptrunner/wptrunner/tests/test_testloader.py index f68bb5fb33a82c..77cd85b820d72e 100644 --- a/tools/wptrunner/wptrunner/tests/test_testloader.py +++ b/tools/wptrunner/wptrunner/tests/test_testloader.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import sys import tempfile diff --git a/tools/wptrunner/wptrunner/wptcommandline.py b/tools/wptrunner/wptrunner/wptcommandline.py index 28bbf27e8f802d..c7050eb80c2bed 100644 --- a/tools/wptrunner/wptrunner/wptcommandline.py +++ b/tools/wptrunner/wptrunner/wptcommandline.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function import argparse import os import sys diff --git a/tools/wptrunner/wptrunner/wptmanifest/parser.py b/tools/wptrunner/wptrunner/wptmanifest/parser.py index f235774ad68353..4c97c6914139cc 100644 --- a/tools/wptrunner/wptrunner/wptmanifest/parser.py +++ b/tools/wptrunner/wptrunner/wptmanifest/parser.py @@ -12,8 +12,6 @@ # TODO: keep comments in the tree -from __future__ import unicode_literals - from io import BytesIO from .node import (Node, AtomNode, BinaryExpressionNode, BinaryOperatorNode, diff --git a/tools/wptrunner/wptrunner/wptmanifest/serializer.py b/tools/wptrunner/wptrunner/wptmanifest/serializer.py index ec8d80ed6f7151..3fc39a43053a1f 100644 --- a/tools/wptrunner/wptrunner/wptmanifest/serializer.py +++ b/tools/wptrunner/wptrunner/wptmanifest/serializer.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from six import ensure_text from .node import NodeVisitor, ValueNode, ListNode, BinaryExpressionNode diff --git a/tools/wptrunner/wptrunner/wptrunner.py b/tools/wptrunner/wptrunner/wptrunner.py index 1c78554cedc17a..196a54c6d427db 100644 --- a/tools/wptrunner/wptrunner/wptrunner.py +++ b/tools/wptrunner/wptrunner/wptrunner.py @@ -1,5 +1,3 @@ -from __future__ import print_function, unicode_literals - import json import os import sys diff --git a/tools/wptserve/tests/functional/base.py b/tools/wptserve/tests/functional/base.py index 045215315ab7a6..e5b4b4b9dcba57 100644 --- a/tools/wptserve/tests/functional/base.py +++ b/tools/wptserve/tests/functional/base.py @@ -1,5 +1,3 @@ -from __future__ import print_function - import base64 import logging import os diff --git a/tools/wptserve/tests/test_replacement_tokenizer.py b/tools/wptserve/tests/test_replacement_tokenizer.py index 8d0f25058d4920..6a3c563c8ce4e4 100644 --- a/tools/wptserve/tests/test_replacement_tokenizer.py +++ b/tools/wptserve/tests/test_replacement_tokenizer.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import pytest from wptserve.pipes import ReplacementTokenizer diff --git a/tools/wptserve/wptserve/ws_h2_handshake.py b/tools/wptserve/wptserve/ws_h2_handshake.py index ac88dd902269e4..5a9ff58dd5fa22 100644 --- a/tools/wptserve/wptserve/ws_h2_handshake.py +++ b/tools/wptserve/wptserve/ws_h2_handshake.py @@ -5,8 +5,6 @@ https://tools.ietf.org/html/rfc8441 """ -from __future__ import absolute_import - from mod_pywebsocket import common from mod_pywebsocket.handshake.base import get_mandatory_header